[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2454-g70c1869

[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  70c1869bbc50976b9a1d5f52a6b7677b3e2876c7 (commit)
      from  d2c7479be55e0123152aabb2a4481f44473595c3 (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 70c1869bbc50976b9a1d5f52a6b7677b3e2876c7
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Aug 7 20:29:06 2011 +0200

    [BUILROOT] split patch 155 into 2 patch files

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

Summary of changes:
 .../155-u.boot-support_for_release_2011_06.patch   |   12 +-----------
 .../156-u.boot-remove-u-boot-patch-prefix.patch    |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch

diff --git a/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch b/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch
index 336f5c9..c9b41f0 100644
--- a/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch
+++ b/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch
@@ -25,14 +25,4 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	default "2010.06"	if BR2_TARGET_UBOOT_2010_06
  	default "2010.03"	if BR2_TARGET_UBOOT_2010_03
  	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
---- a/boot/u-boot/u-boot.mk
-+++ b/boot/u-boot/u-boot.mk
-@@ -95,7 +95,7 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.u
- 		u-boot-$(U_BOOT_VERSION)-\*.patch \
- 		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
- ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
--	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch
-+	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) *.patch
- endif
- 	touch $@
- 
+
diff --git a/patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch b/patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch
new file mode 100644
index 0000000..5094029
--- /dev/null
+++ b/patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch
@@ -0,0 +1,19 @@
+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...>
+---
+
+--- a/boot/u-boot/u-boot.mk
++++ b/boot/u-boot/u-boot.mk
+@@ -95,7 +95,7 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.u
+ 		u-boot-$(U_BOOT_VERSION)-\*.patch \
+ 		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
+ ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
+-	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch
++	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) *.patch
+ endif
+ 	touch $@
+ 


hooks/post-receive
-- 
armadeus