[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-53-g03328f555
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-53-g03328f555
|
From: Julien B a. A. <ar...@us...> - 2019-05-14 15:19:52
|
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 03328f55580caf24cdfb94d85829951db1fd6011 (commit)
via 552ee014bcde330f56bbd17dc5876398f3f89ac9 (commit)
from 7d0042cfb712bbf24e7f51231ce973dfddafcabb (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 03328f55580caf24cdfb94d85829951db1fd6011
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue May 14 17:18:54 2019 +0200
[BUILDROOT] symlink post-build.sh -> post_build.sh && post-image.sh -> post_image_creation.sh to mimic BR mainline
commit 552ee014bcde330f56bbd17dc5876398f3f89ac9
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue May 14 17:15:58 2019 +0200
[BUILDROOT] make apf6_defconfig build with BR 2019.02
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 8 ++++----
buildroot/target/device/armadeus/rootfs/post-build.sh | 1 +
buildroot/target/device/armadeus/rootfs/post-image.sh | 1 +
buildroot/target/device/armadeus/rootfs/post_image_creation.sh | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 120000 buildroot/target/device/armadeus/rootfs/post-build.sh
create mode 120000 buildroot/target/device/armadeus/rootfs/post-image.sh
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 1232f4240..a8afe09b8 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -7,15 +7,15 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
-BR2_ENABLE_LOCALE_PURGE=y
+BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
-BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="europe"
BR2_TARGET_LOCALTIME="Europe/Paris"
+BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="apf6 imx6"
@@ -30,7 +30,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -74,7 +73,6 @@ BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -91,6 +89,7 @@ BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_LEPTONMODULE=y
@@ -126,6 +125,7 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/buildroot/target/device/armadeus/rootfs/post-build.sh b/buildroot/target/device/armadeus/rootfs/post-build.sh
new file mode 120000
index 000000000..6f1ac52e9
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/post-build.sh
@@ -0,0 +1 @@
+post_build.sh
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/post-image.sh b/buildroot/target/device/armadeus/rootfs/post-image.sh
new file mode 120000
index 000000000..fe5c0e725
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/post-image.sh
@@ -0,0 +1 @@
+post_image_creation.sh
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 8d18a1a1c..5b1c7cec4 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -54,7 +54,7 @@ fi
# if target uses ext4 for rootfs and is not an opos6ul,
if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ]; then
# generate also boot.ext4:
- mke2img -d $1/../target/boot/ -G 4 -R 1 -l BOOT -b 49152 -o $1/boot.ext4
+ $1/../host/sbin/mkfs.ext4 -L "BOOT" -r 1 -d $1/../target/boot/ $1/boot.ext4 "48M"
symlink_image $1 boot.ext4 $2-boot.ext4
# overwrite kernel symlink in boot.ext4 as U-Boot doesn't like it:
e2cp $1/*-linux.bin -d $1/boot.ext4:/
hooks/post-receive
--
armadeus
|