[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-358-gd7f962b

[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  d7f962b32c27e2fa832f415bcbdacaa1842bd75a (commit)
       via  114e42b0694e070667624b9caddcfe6fa0263192 (commit)
      from  81250d10b68c6d279dc12153d36661caad232e43 (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 d7f962b32c27e2fa832f415bcbdacaa1842bd75a
Merge: 114e42b0694e070667624b9caddcfe6fa0263192 81250d10b68c6d279dc12153d36661caad232e43
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Feb 22 20:02:20 2011 +0100

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

commit 114e42b0694e070667624b9caddcfe6fa0263192
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Feb 22 19:56:47 2011 +0100

    [BUILDROOT] [2010.11] Add linux26-clean target

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

Summary of changes:
 Makefile                                           |    4 ++++
 .../135-linux-add_linux26-clean_target.patch       |   11 +++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2010.11/135-linux-add_linux26-clean_target.patch

diff --git a/Makefile b/Makefile
index bf52991..31b0e6a 100644
--- a/Makefile
+++ b/Makefile
@@ -146,7 +146,11 @@ linux26: $(BUILDROOT_DIR)/.configured
 	@$(MAKE) -C $(BUILDROOT_DIR) linux26
 
 linux26-clean: $(BUILDROOT_DIR)/.configured
+ifeq ($(BUILDROOT_VERSION),20081103)
 	@$(MAKE) -C $(BUILDROOT_DIR) linux26clean
+else
+	@$(MAKE) -C $(BUILDROOT_DIR) linux26-clean
+endif
 
 %_defconfig: $(BUILDROOT_DIR)/.patched
 	@if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ]; then \
diff --git a/patches/buildroot/2010.11/135-linux-add_linux26-clean_target.patch b/patches/buildroot/2010.11/135-linux-add_linux26-clean_target.patch
new file mode 100644
index 0000000..31ecf9c
--- /dev/null
+++ b/patches/buildroot/2010.11/135-linux-add_linux26-clean_target.patch
@@ -0,0 +1,11 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk	2011-02-22 19:48:10.000000000 +0100
++++ buildroot/linux/linux.mk	2011-02-22 19:48:45.000000000 +0100
+@@ -188,3 +188,6 @@
+ endif
+ 
+ endif
++
++linux26-clean:
++	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) clean


hooks/post-receive
-- 
armadeus