make-3.82 complains about mixed implicit and normal rules on busybox 1.15.x/1.16.x Makefile. 1.17.x versions are not affected.
Signed-off-by: Vasily Khoruzhick <[email protected]> --- recipes/busybox/busybox_1.15.3.bb | 3 ++- recipes/busybox/busybox_1.16.2.bb | 6 +++++- recipes/busybox/files/busybox-make-3-82.patch | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 recipes/busybox/files/busybox-make-3-82.patch diff --git a/recipes/busybox/busybox_1.15.3.bb b/recipes/busybox/busybox_1.15.3.bb index 5fa6225..987b9c5 100644 --- a/recipes/busybox/busybox_1.15.3.bb +++ b/recipes/busybox/busybox_1.15.3.bb @@ -1,8 +1,9 @@ require busybox_1.1x.inc -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SRC_URI += "\ file://0000-wget-no-check-certificate.patch \ + file://busybox-make-3-82.patch \ " SRC_URI[md5sum] = "6059ac9456de6fb18dc8ee4cd0ec9240" diff --git a/recipes/busybox/busybox_1.16.2.bb b/recipes/busybox/busybox_1.16.2.bb index 982b49b..fb80b52 100644 --- a/recipes/busybox/busybox_1.16.2.bb +++ b/recipes/busybox/busybox_1.16.2.bb @@ -1,5 +1,9 @@ require busybox_1.1x.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" + +SRC_URI += "\ + file://busybox-make-3-82.patch \ +" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "1" diff --git a/recipes/busybox/files/busybox-make-3-82.patch b/recipes/busybox/files/busybox-make-3-82.patch new file mode 100644 index 0000000..5c5c3b6 --- /dev/null +++ b/recipes/busybox/files/busybox-make-3-82.patch @@ -0,0 +1,20 @@ +--- busybox-1.7.4/Makefile.1 2010-10-26 19:31:29.040000217 +0300 ++++ busybox-1.7.4/Makefile 2010-10-26 19:39:14.010000218 +0300 +@@ -402,7 +402,7 @@ 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 +@@ -1240,7 +1240,7 @@ 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) + %.ko: prepare scripts FORCE -- 1.7.3.2 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
