[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-175-g934c435d9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-175-g934c435d9
|
From: Sébastien S. <ss...@us...> - 2020-03-26 14:25: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 934c435d94c3a6f1ca499aef87f5136244269ec1 (commit)
via 339d78ced6f665d80243d2fec7af6769447da6c1 (commit)
via ef2fe51d46346a27ef478950040822c91d6a9105 (commit)
from 8e5cc02411540332d016048edf0ea778371cf39d (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 934c435d94c3a6f1ca499aef87f5136244269ec1
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Mar 26 15:23:52 2020 +0100
[BUILDROOT] post_image_creation.sh: use ARMADEUS_TOPDIR var
To make it work with out-of-tree build.
commit 339d78ced6f665d80243d2fec7af6769447da6c1
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Mar 26 15:06:11 2020 +0100
[BUILDROOT] Out-of-tree build: change to Armadeus BSP directory
When using out-of-tree build, Buildroot generates a Makefile in the output
directory. This Makefile changes to the Buildroot directory. Make it change to
the Armadeus directory.
commit ef2fe51d46346a27ef478950040822c91d6a9105
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Mar 26 12:05:29 2020 +0100
[BUILDROOT] opos6ul{,nano,sp} / apf6: bump kernel to 4.19.113
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
.../device/armadeus/rootfs/post_image_creation.sh | 2 +-
...eus-point-to-armadeus-in-out-of-tree-makefile.patch | 18 ++++++++++++++++++
6 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 6bfacc8d9..eb7f527b6 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -25,7 +25,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.112"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.113"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index f4538643b..cbe31cfe8 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.112"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.113"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 3847d49b3..e4f3aca1f 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.112"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.113"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index f7c002e83..c6624a4fa 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.112"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.113"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index a9e6f5764..3758ceb96 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -66,7 +66,7 @@ if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ]; then
fi
# generate full HD/MMC image if config file found
-GENIMAGE_CFG="${BASE_DIR}/../target/device/armadeus/$2/genimage.cfg"
+GENIMAGE_CFG="${ARMADEUS_TOPDIR}/buildroot/target/device/armadeus/$2/genimage.cfg"
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
rm -rf "${GENIMAGE_TMP}"
if [ -f "$GENIMAGE_CFG" ]; then
diff --git a/patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch b/patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
new file mode 100644
index 000000000..5ee900d06
--- /dev/null
+++ b/patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
@@ -0,0 +1,18 @@
+When using out-of-tree build, Buildroot generates a Makefile in the output
+directory. This Makefile changes to the Buildroot directory. Make it change to
+the Armadeus directory.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+Index: buildroot/Makefile
+===================================================================
+--- buildroot.orig/Makefile
++++ buildroot/Makefile
+@@ -1015,7 +1015,7 @@ $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_D
+ .PHONY: outputmakefile
+ outputmakefile:
+ ifeq ($(NEED_WRAPPER),y)
+- $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
++ $(Q)$(TOPDIR)/support/scripts/mkmakefile $(subst /buildroot,,$(TOPDIR)) $(O)
+ endif
+
+ # Even though the target is a real file, we mark it as PHONY as we
hooks/post-receive
--
armadeus
|