[busybox/f14/master] - fix build system so that it works with make 3.82 too

[Denys Vlasenko]

commit be34d7547fcf61f612eee836e080972383f05114
Author: Denys Vlasenko <dvlasenk at redhat.com>
Date:   Fri Sep 17 12:58:27 2010 +0200

    - fix build system so that it works with make 3.82 too

 busybox-1.15.1-build_system.patch |   41 +++++++++++++++++++++++++++++++++++++
 busybox.spec                      |    7 +++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/busybox-1.15.1-build_system.patch b/busybox-1.15.1-build_system.patch
new file mode 100644
index 0000000..1752266
--- /dev/null
+++ b/busybox-1.15.1-build_system.patch
@@ -0,0 +1,41 @@
+commit adbe3b5b982874071b9b826cea1632fc00c85982
+Author: Denys Vlasenko <vda.linux at googlemail.com>
+Date:   Sun Aug 22 09:28:46 2010 +0200
+
+    build system: make 3.82 fix. Closes bug 2323
+    
+    Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
+
+diff --git a/Makefile b/Makefile
+index 2d6a3b2..d13abc8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -433,7 +433,12 @@ ifeq ($(config-targets),1)
+ -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
+@@ -1285,9 +1290,13 @@ endif
+ 	$(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/busybox.spec b/busybox.spec
index 1552e47..51c7119 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.15.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -17,6 +17,7 @@ Patch23: busybox-1.15.1-man.patch
 Patch24: uClibc-0.9.30.1-utmp.patch
 Patch25: busybox-1.15.1-uname.patch
 Patch26: uClibc-0.9.30.1-etc_localtime.patch
+Patch27: busybox-1.15.1-build_system.patch
 Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ cat %{SOURCE4} >uClibc-0.9.30.1/.config1
 %patch24 -b .utmp -p1
 %patch25 -b .uname -p1
 %patch26 -b .etc_localtime -p1
+%patch27 -b .build_system -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
+* Fri Sep 17 2010 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-8
+- fix build system so that it works with make 3.82 too
+
 * Wed May  5 2010 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-7
 - teach uclibc to use /etc/localtime