[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2613-gcb9f801

[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  cb9f80112f464a415473b777e2fa05fbfa01d675 (commit)
       via  d2ff9b965c40318e28d121ba4713a5e2121574bc (commit)
      from  e9d12f8c16d5dc3923cb859578265004e6e6991d (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 cb9f80112f464a415473b777e2fa05fbfa01d675
Merge: d2ff9b9 e9d12f8
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Dec 5 12:47:55 2011 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit d2ff9b965c40318e28d121ba4713a5e2121574bc
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Dec 5 12:46:57 2011 +0100

    [BUILDROOT] fix apf27 and apf9328 mkimage compilation

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

Summary of changes:
 .../2011.05/166-uboot-add-u-boot_make_target.patch |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch b/patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch
index 0357957..2d97a2c 100644
--- a/patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch
+++ b/patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch
@@ -15,3 +15,12 @@ Index: buildroot/boot/u-boot/u-boot.mk
  
  # Copy the result to the images/ directory
  $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+@@ -186,7 +186,7 @@ endif
+ # the U-Boot build procedure, but mkimage may also be needed even if
+ # U-Boot isn't selected in the configuration, to generate a kernel
+ # uImage.
+-$(MKIMAGE): $(U_BOOT_DIR)/.patched
++$(MKIMAGE): $(U_BOOT_DIR)/.configured
+ 	mkdir -p $(@D)
+ 	$(MAKE) -C $(U_BOOT_DIR) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) tools
+ 	cp -dpf $(U_BOOT_DIR)/tools/mkimage $(@D)


hooks/post-receive
-- 
armadeus