[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-249-gd970030

[jorasse <jo...@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  d970030610a9e404e86f75ad1a36d640ce3a7522 (commit)
      from  96c7dde3124d6c778350816b6965347c837221a4 (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 d970030610a9e404e86f75ad1a36d640ce3a7522
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 3 19:24:40 2012 +0200

    [BUILDROOT] Change BR specific patches for UBoot to be a hook command in the armadeus makefiles

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

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |    9 ++++---
 .../156-u.boot-remove-u-boot-patch-prefix.patch    |   22 --------------------
 2 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 6bd55ea..0232231 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,12 +9,13 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
 # for old BR:
 LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
 
-ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),)
-define UBOOT_COPY_CONFIG_HEADER_FILE
+define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
+$(ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),))
 	cp -pf $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE) $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
 endef
-UBOOT_POST_PATCH_HOOKS += UBOOT_COPY_CONFIG_HEADER_FILE
-endif
+UBOOT_POST_PATCH_HOOKS += UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
 
 define UBOOT_UPDATE_CONFIG_HEADER
 	$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
diff --git a/patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch b/patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch
deleted file mode 100644
index b8d4a9e..0000000
--- a/patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-U-Boot: Remove u-boot patch prefix from filename
-
-Remove expected u-boot prefix from U-Boot patches in order to manage patches
-with patch mangement tools such as quilt or stgit
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
----
-
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot.orig/boot/uboot/uboot.mk	2012-02-21 16:44:29.000000000 +0100
-+++ buildroot/boot/uboot/uboot.mk	2012-02-21 16:46:04.000000000 +0100
-@@ -62,8 +62,7 @@
- 
- ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
- define UBOOT_APPLY_CUSTOM_PATCHES
--	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
--		uboot-$(UBOOT_VERSION)-\*.patch
-+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
- endef
- 
- UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CUSTOM_PATCHES


hooks/post-receive
-- 
armadeus