[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-68-g0032876

[Julien B a. A. <ar...@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  00328763da10300a4e771ae3355ad79e1396fae0 (commit)
      from  9f7983c8618e9e0219ecdf6514dac895bae8dfd3 (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 00328763da10300a4e771ae3355ad79e1396fae0
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 21:33:11 2010 +0200

    [BUILDROOT] [2010.11] Makes Linux image get the correct name when copied to ouput/images/

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

Summary of changes:
 patches/buildroot/2010.11/040-linux-makefile.patch |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/patches/buildroot/2010.11/040-linux-makefile.patch b/patches/buildroot/2010.11/040-linux-makefile.patch
index cf878e2..7feaa1d 100644
--- a/patches/buildroot/2010.11/040-linux-makefile.patch
+++ b/patches/buildroot/2010.11/040-linux-makefile.patch
@@ -1,7 +1,7 @@
 Index: buildroot/linux/linux.mk
 ===================================================================
---- buildroot.orig/linux/linux.mk	2010-10-17 22:17:19.000000000 +0200
-+++ buildroot/linux/linux.mk	2010-10-19 09:43:24.000000000 +0200
+--- buildroot.orig/linux/linux.mk	2010-10-14 21:40:47.000000000 +0200
++++ buildroot/linux/linux.mk	2010-10-20 21:26:50.000000000 +0200
 @@ -29,7 +29,8 @@
  
  # Get the real Linux version, which tells us where kernel modules are
@@ -22,6 +22,15 @@ Index: buildroot/linux/linux.mk
  	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
  	$(Q)touch $@
  
+@@ -125,7 +129,7 @@
+ # Installation
+ $(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
+ 	@$(call MESSAGE,"Installing kernel")
+-	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
++	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)/$(LINUX26_KERNEL_NAME)
+ 	# Install modules and remove symbolic links pointing to build
+ 	# directories, not relevant on the target
+ 	@if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then 	\
 @@ -151,7 +155,7 @@
  	# Build the kernel.
  	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)


hooks/post-receive
-- 
armadeus