[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-458-g37c02d2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-458-g37c02d2
|
From: Julien B a. A. <ar...@us...> - 2013-09-22 19:04:14
|
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 37c02d2c14843d32b5ec58fedd82b80341bc830c (commit)
from ae629479371fb96350c7f8d46d21a79e7653666e (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 37c02d2c14843d32b5ec58fedd82b80341bc830c
Author: Julien Boibessot <jul...@ar...>
Date: Sun Sep 22 21:03:49 2013 +0200
[BUILDROOT][2013.05] Remove hacks to rename rootfs images and use BR normal way of doing it
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf27_webradio_defconfig | 1 +
buildroot/configs/apf27test_defconfig | 1 +
buildroot/configs/apf28_defconfig | 1 +
buildroot/configs/apf28test_defconfig | 1 +
buildroot/configs/apf51_defconfig | 1 +
buildroot/configs/apf51mainline_defconfig | 1 +
buildroot/configs/apf51test_defconfig | 1 +
buildroot/configs/apf9328_defconfig | 1 +
buildroot/configs/apf9328test_defconfig | 1 +
buildroot/configs/pps51_defconfig | 1 +
buildroot/configs/pps_defconfig | 1 +
.../device/armadeus/rootfs/post_image_creation.sh | 16 ++++++++++
...linux-add-board-name-to-initrd-image-name.patch | 18 ------------
...ffs2-add_board_name_to_binary_rootfs_name.patch | 30 --------------------
15 files changed, 28 insertions(+), 48 deletions(-)
create mode 100755 buildroot/target/device/armadeus/rootfs/post_image_creation.sh
delete mode 100644 patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
delete mode 100644 patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 0c60dbe..7859c87 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 2f63a7c..6bade92 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -29,6 +29,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 60acf9c..edb9230 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index e0ce2c3..235c7eb 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 192032a..c7dbc27 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 440ee1f..c03bf9e 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -31,6 +31,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 93f139f..79e197a 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 3c29091..c5a310f 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -30,6 +30,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 3b3e243..29f9c09 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -29,6 +29,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf9328"
BR2_CPU_NAME="imxl"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 89fc550..8044716 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -29,6 +29,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf9328"
BR2_CPU_NAME="imxl"
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 8f49ab1..11135ff 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -32,6 +32,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="pps51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 51ae4de..d09f62b 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -26,6 +26,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="pps"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
new file mode 100755
index 0000000..0659532
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Create custom directories and links of Armadeus rootfs
+#
+
+if [ ! -d "$1" ]; then
+ echo "Target directory ($1) not valid !"
+ exit 1
+fi
+
+BOARD_NAME=`grep 'BR2_BOARD_NAME=' $BUILDROOT_CONFIG | cut -d = -f 2 | sed s/\"//g`
+if [ "$BOARD_NAME" != "" ]; then
+ mv -u $1/rootfs.ubi $1/$BOARD_NAME-rootfs.ubi
+fi
+
+exit 0
diff --git a/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch b/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
deleted file mode 100644
index 5bdc59a..0000000
--- a/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-We rename images in binaries/ directory, so take that into account when Linux
-needs to find cpio image to generate initrd.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2013-09-20 17:00:19.172366934 +0200
-+++ buildroot/linux/linux.mk 2013-09-20 17:00:53.184535598 +0200
-@@ -185,7 +185,7 @@
- $(if $(BR2_TARGET_ROOTFS_INITRAMFS),
- touch $(BINARIES_DIR)/rootfs.cpio
- $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
-- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
-+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.cpio\",$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
- $(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
diff --git a/patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch b/patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
deleted file mode 100644
index 86319ea..0000000
--- a/patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Add "BR2_BOARD_NAME" prefix to the rootfs binary filename.
-
-Specific for Armadeus.
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/fs/common.mk
-===================================================================
---- buildroot.orig/fs/common.mk 2012-02-21 16:43:25.000000000 +0100
-+++ buildroot/fs/common.mk 2012-02-21 16:45:54.000000000 +0100
-@@ -42,8 +42,8 @@
- # extra deps
- ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma) $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZO),host-lzop) $$(if $$(BR2_TARGET_ROOTFS_$(2)_XZ),host-xz)
-
--$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
-- @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
-+$$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
-+ @$$(call MESSAGE,"Generating root filesystem image $(BR2_BOARD_NAME)-rootfs.$(1)")
- $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
- rm -f $$(FAKEROOT_SCRIPT)
- rm -f $$(TARGET_DIR_WARNING_FILE)
-@@ -83,7 +83,7 @@
- rootfs-$(1)-show-depends:
- @echo $$(ROOTFS_$(2)_DEPENDENCIES)
-
--rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
-+rootfs-$(1): $$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
-
- ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
- TARGETS += rootfs-$(1)
hooks/post-receive
--
armadeus
|
