[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-810-ga792fc8

[Julien B a. A. <ar...@us...>]

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  a792fc86f8ad1817f027be685a4d7fb9a03a4580 (commit)
       via  1c58e05a3241d5520c127388888c2ad09e3e4926 (commit)
       via  3761ba169fec34bbd4315be2edb4b89d0bc62c9f (commit)
       via  36f87bc23e892735bf610de73707f2d56f33de0f (commit)
      from  a1a1d2ff5837cad7e4773262befea74848e3b6a3 (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 a792fc86f8ad1817f027be685a4d7fb9a03a4580
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Aug 4 12:42:50 2015 +0200

    [BUILDROOT] bump apf-config version

commit 1c58e05a3241d5520c127388888c2ad09e3e4926
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Aug 4 12:30:42 2015 +0200

    [BUILDROOT] post_build.sh: when existing create a dtbs/ symlink in boot filesystem to be compatible with pre-6.0 U-Boots

commit 3761ba169fec34bbd4315be2edb4b89d0bc62c9f
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jul 31 16:13:42 2015 +0200

    [BUILDROOT] apf6/genimage.cfg: fixes boot partition offset in eMMC

commit 36f87bc23e892735bf610de73707f2d56f33de0f
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jul 31 12:45:30 2015 +0200

    [BUILDROOT] Introduces 2 new image files: boot.ext4 and user_data.ext4, for platforms with eMMC, like the APF6. This way, eMMC recover from U-Boot is eased.

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/apf6/genimage.cfg |   22 ++++++++++++++++++++
 .../target/device/armadeus/rootfs/post_build.sh    |    1 +
 .../device/armadeus/rootfs/post_image_creation.sh  |   22 +++++++++++++++++++-
 .../025-armadeus-apf-config-add-package.patch      |    2 +-
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/apf6/genimage.cfg

diff --git a/buildroot/target/device/armadeus/apf6/genimage.cfg b/buildroot/target/device/armadeus/apf6/genimage.cfg
new file mode 100644
index 0000000..1295335
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/genimage.cfg
@@ -0,0 +1,22 @@
+# Image for the APF6 eMMC "User Data" partition
+#
+# For details about the layout, see:
+# http://www.armadeus.com/wiki/index.php?title=EMMC
+
+image apf6-user_data.ext4 {
+	hdimage {
+	}
+
+	partition boot {
+		partition-type = 0x83
+		image = "apf6-boot.ext4"
+		offset = 1M
+		size = 24M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "apf6-rootfs.ext4"
+		size = 3750M
+	}
+}
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index 26cb6d0..0e1be46 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -58,6 +58,7 @@ ln -sf /tmp $1/var/spool
 ln -sf /tmp $1/var/tmp
 # /boot
 mkdir -p $1/boot
+ln -sf . $1/boot/dtbs	# to keep compat with pre-6.0 APF6 U-Boots
 symlink_image $1/boot uImage $2-linux.bin
 symlink_image $1/boot zImage $2-linux.bin
 
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 361a081..1c0bfcf 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -49,4 +49,24 @@ else
 	fi
 fi
 
-exit 0
+# if target uses ext4 for rootfs, generate also boot.ext4
+if [ -f "$1/rootfs.ext4" ]; then
+	mke2img -d $1/../target/boot/ -G 4 -o $1/boot.ext4
+	symlink_image $1 boot.ext4 $2-boot.ext4
+fi
+
+# generate full HD/MMC image if config file found
+GENIMAGE_CFG="${BASE_DIR}/../target/device/armadeus/$2/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+rm -rf "${GENIMAGE_TMP}"
+if [ -f "$GENIMAGE_CFG" ]; then
+	genimage \
+		--rootpath "${TARGET_DIR}" \
+		--tmppath "${GENIMAGE_TMP}" \
+		--inputpath "${BINARIES_DIR}" \
+		--outputpath "${BINARIES_DIR}" \
+		--config "${GENIMAGE_CFG}"
+fi
+
+RET=${?}
+exit ${RET}
diff --git a/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch
index 4697198..e396acb 100644
--- a/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch
+++ b/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch
@@ -37,7 +37,7 @@ Index: buildroot/package/apf-config/apf-config.mk
 +#
 +################################################################################
 +
-+APF_CONFIG_VERSION = e8903ad36a048dd7fad17f3d1216bc4b22d981fa
++APF_CONFIG_VERSION = 657054711f7e270d7c5066c76bdd65dd56a98dd9
 +APF_CONFIG_SITE = $(call github,artemysfr,raspi-config,$(APF_CONFIG_VERSION))
 +APF_CONFIG_LICENSE = MIT
 +APF_CONFIG_LICENSE_FILES = LICENSE


hooks/post-receive
-- 
armadeus