[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-218-gbff3ea8

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  bff3ea864e4ebc229e1e0577ac108fcc8b301fd2 (commit)
       via  e4db1d3cd9b9385779bda47930c69d9155440f6c (commit)
      from  af3841d004046113044d7c16e5c279c510b94925 (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 bff3ea864e4ebc229e1e0577ac108fcc8b301fd2
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Apr 5 21:56:23 2013 +0200

    [BUILDROOT] 2012.02: add a fix to allow kernel+initrd image generation

commit e4db1d3cd9b9385779bda47930c69d9155440f6c
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Apr 5 21:20:08 2013 +0200

    [BUILDROOT] Fixes 2012.02 build due to gnokii package recent adding and makes this package also available for 2013.02

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

Summary of changes:
 .../2012.02/201-armadeus-add_gnokii.patch          |    2 +-
 ...initrd_generation_with_armadeus_platforms.patch |   31 ++++++++++++++++++++
 patches/buildroot/2012.02/cleanup_buildroot.sh     |    8 +++--
 .../201-armadeus-add_gnokii.patch                  |    2 +-
 patches/buildroot/2013.02/cleanup_buildroot.sh     |    1 +
 5 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 patches/buildroot/2012.02/202-armadeus-fixes_initrd_generation_with_armadeus_platforms.patch
 copy patches/buildroot/{2012.02 => 2013.02}/201-armadeus-add_gnokii.patch (96%)

diff --git a/patches/buildroot/2012.02/201-armadeus-add_gnokii.patch b/patches/buildroot/2012.02/201-armadeus-add_gnokii.patch
index a0aa128..652dac0 100644
--- a/patches/buildroot/2012.02/201-armadeus-add_gnokii.patch
+++ b/patches/buildroot/2012.02/201-armadeus-add_gnokii.patch
@@ -1,6 +1,6 @@
 Gnokii: add sms management program gnokii
 
-signed-off-by Fabien Marteau <fab...@ar...>
+Signed-off-by: Fabien Marteau <fab...@ar...>
 ---
 
 Index: buildroot/package/Config.in
diff --git a/patches/buildroot/2012.02/202-armadeus-fixes_initrd_generation_with_armadeus_platforms.patch b/patches/buildroot/2012.02/202-armadeus-fixes_initrd_generation_with_armadeus_platforms.patch
new file mode 100644
index 0000000..3e35009
--- /dev/null
+++ b/patches/buildroot/2012.02/202-armadeus-fixes_initrd_generation_with_armadeus_platforms.patch
@@ -0,0 +1,31 @@
+No more needed on recent BR as image names can be renamed with BR2_ROOTFS_POST_IMAGE_SCRIPT.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk	2013-04-05 21:21:26.000000000 +0200
++++ buildroot/linux/linux.mk	2013-04-05 21:44:52.000000000 +0200
+@@ -152,9 +152,9 @@
+ 	# replaced later by the real cpio archive, and the kernel will be
+ 	# rebuilt using the linux26-rebuild-with-initramfs target.
+ 	$(if $(BR2_TARGET_ROOTFS_INITRAMFS),
+-		touch $(BINARIES_DIR)/rootfs.cpio
++		touch $(BINARIES_DIR)/$(BOARD_NAME)-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)/$(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)
+@@ -225,8 +225,8 @@
+ endif
+ 
+ # Support for rebuilding the kernel after the cpio archive has
+-# been generated in $(BINARIES_DIR)/rootfs.cpio.
+-$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio
++# been generated in $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.cpio.
++$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.cpio
+ 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
+ 	# Build the kernel.
+ 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index bd98625..0fbb714 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -75,9 +75,11 @@ rm -rf buildroot/package/linux-firmware/
 rm -rf buildroot/package/uboot-tools/
 rm -rf buildroot/package/qtcreator/
 rm -rf buildroot/package/marble/
-rm -rf buildroot/package/m4/m4-1.4.16-no-gets.patch
-rm -rf buildroot/package/tar/tar-1.26-no-gets.patch
+rm -f buildroot/package/m4/m4-1.4.16-no-gets.patch
+rm -f buildroot/package/tar/tar-1.26-no-gets.patch
 rm -rf buildroot/package/cunit/
 rm -rf buildroot/package/qextserialport/
 rm -rf buildroot/package/compat-wireless/
-rm -rf buildroot/package/qt/qt-4.7.4-map_keyboard_keys_metas_and_menu.patch
+rm -f buildroot/package/qt/qt-4.7.4-map_keyboard_keys_metas_and_menu.patch
+rm -rf buildroot/package/gnokii/
+rm -f buildroot/linux/linux.mk
diff --git a/patches/buildroot/2012.02/201-armadeus-add_gnokii.patch b/patches/buildroot/2013.02/201-armadeus-add_gnokii.patch
similarity index 96%
copy from patches/buildroot/2012.02/201-armadeus-add_gnokii.patch
copy to patches/buildroot/2013.02/201-armadeus-add_gnokii.patch
index a0aa128..652dac0 100644
--- a/patches/buildroot/2012.02/201-armadeus-add_gnokii.patch
+++ b/patches/buildroot/2013.02/201-armadeus-add_gnokii.patch
@@ -1,6 +1,6 @@
 Gnokii: add sms management program gnokii
 
-signed-off-by Fabien Marteau <fab...@ar...>
+Signed-off-by: Fabien Marteau <fab...@ar...>
 ---
 
 Index: buildroot/package/Config.in
diff --git a/patches/buildroot/2013.02/cleanup_buildroot.sh b/patches/buildroot/2013.02/cleanup_buildroot.sh
index 0d11337..b2cbd46 100755
--- a/patches/buildroot/2013.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.02/cleanup_buildroot.sh
@@ -70,3 +70,4 @@ rm -rf buildroot/package/uboot-tools/
 rm -rf buildroot/package/qtcreator/
 rm -rf buildroot/package/marble/
 rm -rf buildroot/package/cunit/
+rm -rf buildroot/package/gnokii/


hooks/post-receive
-- 
armadeus


