[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-308-gf5e94c2

[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  f5e94c225bc48fbe5d049d91264c41e80b5d1991 (commit)
      from  ff91d85ef3866ea873ac91a06b844f34c922ec10 (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 f5e94c225bc48fbe5d049d91264c41e80b5d1991
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Jul 8 10:12:23 2011 +0200

    [BUILDROOT] Add fix to build 1.16 busybox with make 3.82

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

Summary of changes:
 ...153-busybox-fix_1.16_build_with_make_3.82.patch |   42 ++++++++++++++++++++
 patches/buildroot/2010.11/cleanup_buildroot.sh     |    1 +
 2 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2010.11/153-busybox-fix_1.16_build_with_make_3.82.patch

diff --git a/patches/buildroot/2010.11/153-busybox-fix_1.16_build_with_make_3.82.patch b/patches/buildroot/2010.11/153-busybox-fix_1.16_build_with_make_3.82.patch
new file mode 100644
index 0000000..9172e37
--- /dev/null
+++ b/patches/buildroot/2010.11/153-busybox-fix_1.16_build_with_make_3.82.patch
@@ -0,0 +1,42 @@
+Backport from busybox mainline (1.18)
+
+Signed-off-by: Gwenhael Goavec-Merou <gw...@tr...>
+
+Index: buildroot/package/busybox/busybox-1.16.2/busybox-make_3.82.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/busybox/busybox-1.16.2/busybox-make_3.82.patch	2011-07-08 09:23:49.000000000 +0200
+@@ -0,0 +1,33 @@
++Fixes build with make 3.82.
++
++--- busybox-1.16.2/Makefile	2010-06-12 15:51:56.000000000 +0200
+++++ busybox-1.16.2.mod/Makefile	2011-07-06 17:25:31.000000000 +0200
++@@ -428,7 +428,12 @@
++ -include $(srctree)/arch/$(ARCH)/Makefile
++ export KBUILD_DEFCONFIG
++ 
++-config %config: scripts_basic outputmakefile FORCE
+++config: scripts_basic outputmakefile FORCE
+++	$(Q)mkdir -p include
+++	$(Q)$(MAKE) $(build)=scripts/kconfig $@
+++	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+++
+++%config: scripts_basic outputmakefile FORCE
++ 	$(Q)mkdir -p include
++ 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
++ 	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
++@@ -1276,9 +1281,13 @@
++ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
++ 
++ # Modules
++-/ %/: prepare scripts FORCE
+++%/: prepare scripts FORCE
++ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
++ 	$(build)=$(build-dir)
+++/: prepare scripts FORCE
+++	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+++	$(build)=$(build-dir)
+++
++ %.ko: prepare scripts FORCE
++ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
++ 	$(build)=$(build-dir) $(@:.ko=.o)
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 6cd7c25..ed00db6 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -55,3 +55,4 @@ rm -rf buildroot/package/ngircd/
 rm -rf buildroot/package/can-utils/
 rm -f buildroot/toolchain/uClibc/*.patch
 rm -f buildroot/package/ntp/ntp-nano.patch
+rm -f buildroot/package/busybox/busybox-1.16.2/*.patch


hooks/post-receive
-- 
armadeus