busybox: Fix another make 3.82 issue
cover busybox: Fix another make 3.82 issue
This fixes two "mixed implicit and normal rules" Makefile errors during do_configure, seen on Fedora 14 build hosts.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: sgarman/busybox-fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/busybox-fix
Thanks,
Scott Garman <[email protected]>
---
Scott Garman (1):
busybox: Fix another make 3.82 issue
.../busybox/busybox-1.16.2/make-382-fix2.patch | 24 ++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.16.2.bb | 1 + 2 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox-1.16.2/make-382-fix2.patch
Signature · 1 line
1.7.3.2
PATCH 1/1 busybox: Fix another make 3.82 issue
This fixes two "mixed implicit and normal rules" Makefile errors during do_configure, seen on Fedora 14 build hosts.
Signed-off-by Scott Garman <[email protected]>
--- .../busybox/busybox-1.16.2/make-382-fix2.patch | 24 ++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.16.2.bb | 1 + 2 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox-1.16.2/make-382-fix2.patch
meta/recipes-core/busybox/busybox-1.16.2/make-382-fix2.patch new file +24 -0
@@ -0,0 +1,24 @@ +# Fix to build with make v3.82 (needed for Fedora 14 host) +# Signed-off-by: Scott Garman <[email protected]> + +diff -urN busybox-1.16.2.orig/Makefile busybox-1.16.2/Makefile +--- busybox-1.16.2.orig/Makefile 2010-06-12 06:51:56.000000000 -0700 ++++ busybox-1.16.2/Makefile 2010-11-16 12:49:42.890122989 -0800 +@@ -428,7 +428,7 @@ + -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 +@@ -1276,7 +1276,7 @@ + $(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) + %.ko: prepare scripts FORCE
meta/recipes-core/busybox/busybox_1.16.2.bb +1 -0
@@ -9,6 +9,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-appletlib-dependency.patch \ file://run-parts.in.usr-bin.patch \ file://make-382-fix.patch \ + file://make-382-fix2.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \
Signature · 1 line
1.7.3.2