[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-59-ga20305b2a
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2019-05-21 07:30:29
|
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 a20305b2a1dde23c184406a9c6245d7fb018427b (commit)
from 3668bc7b0434dcbadc85961a81c293788145616e (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 a20305b2a1dde23c184406a9c6245d7fb018427b
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue May 21 09:27:58 2019 +0200
[BUILDROOT] 2019.02: fixes apf6mailine-4.19_defconfig build
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6mailine-4.19_defconfig | 6 ++++--
buildroot/target/device/armadeus/rootfs/post_image_creation.sh | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/buildroot/configs/apf6mailine-4.19_defconfig b/buildroot/configs/apf6mailine-4.19_defconfig
index bdce3faa0..7fdcb6cb8 100644
--- a/buildroot/configs/apf6mailine-4.19_defconfig
+++ b/buildroot/configs/apf6mailine-4.19_defconfig
@@ -7,11 +7,12 @@ 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_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=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_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="europe"
BR2_TARGET_LOCALTIME="Europe/Paris"
BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
@@ -25,7 +26,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.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.42"
BR2_LINUX_KERNEL_PATCH="../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"
@@ -148,6 +149,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_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 5b1c7cec4..a9e6f5764 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -54,6 +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:
+ rm -f $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:
hooks/post-receive
--
armadeus
|