[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-316-g62e4d3b55
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2022-02-24 09:27:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 62e4d3b55e3bdf4b1cb598c9cb8d0d1266687dda (commit)
via cd3aa1777a4dc8592c18efa5f2ed0208e7ec0e03 (commit)
from ec875f2aac27e54cf54ff374cd3bdf6022a025ec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 62e4d3b55e3bdf4b1cb598c9cb8d0d1266687dda
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 24 10:22:01 2022 +0100
[BUILD] Makefile.in: fix ARMADEUS_TOOLCHAIN_PREFIX
To support other arches than 'arm', ie. 'aarch64'.
commit cd3aa1777a4dc8592c18efa5f2ed0208e7ec0e03
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 23 18:50:09 2022 +0100
[BUILDROOT] post_build.sh: OPOS8M{Mini,Nano} -> OPOS8M{M,N}
So that S11firstboot init.d script can find /etc/fw_env_opos8mm.config
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
buildroot/target/device/armadeus/rootfs/post_build.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 54310d908..1ca11afca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,7 +117,7 @@ ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
ARMADEUS_TOOLCHAIN_PREFIX=$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-
else
-ARMADEUS_TOOLCHAIN_PREFIX=arm-linux-
+ARMADEUS_TOOLCHAIN_PREFIX=$(BR2_ARCH)-linux-
endif
ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -dumpversion)
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index e5b6697a4..7c100ab7d 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -43,9 +43,9 @@ if [ "$3" != "imxl" ]; then
echo "OPOS6UL" > $1/etc/machine
fi
elif [ "$3" == "imx8mm" ]; then
- echo "OPOS8MMINI" > $1/etc/machine
+ echo "OPOS8MM" > $1/etc/machine
elif [ "$3" == "imx8mn" ]; then
- echo "OPOS8MNANO" > $1/etc/machine
+ echo "OPOS8MN" > $1/etc/machine
else
echo "APF"${3//[!0-9]/} > $1/etc/machine
fi
hooks/post-receive
--
armadeus
|