diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-12-14 12:21:33 +0000 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-12-14 12:23:24 +0000 |
commit | 0cc23a86562d0ce1e236ceb4a56a8f19d400192f (patch) | |
tree | e5baeb8c873d3e0bed645c27b87a3d403a188995 /meta/recipes-core | |
parent | 30c39cc97c384134661300e107d7a81f257f8034 (diff) | |
download | poky-0cc23a86562d0ce1e236ceb4a56a8f19d400192f.tar.gz |
busybox: additional fixes for Make 3.82
There where still some mixed implicit and normal rules in the Busybox Makefile,
Update our existing make-382.patch to split these into separate rules.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch b/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch index 4ef125d6c0..010457cc03 100644 --- a/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch +++ b/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch | |||
@@ -6,10 +6,10 @@ Subject: mkmakefile: make 3.82 fix | |||
6 | Signed-off-by: Thomas Chou <thomas@wytron.com.tw> | 6 | Signed-off-by: Thomas Chou <thomas@wytron.com.tw> |
7 | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> | 7 | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> |
8 | --- | 8 | --- |
9 | diff --git a/scripts/mkmakefile b/scripts/mkmakefile | 9 | Index: busybox-1.16.2/scripts/mkmakefile |
10 | index 7f9d544..9fc51a7 100755 | 10 | =================================================================== |
11 | --- a/scripts/mkmakefile | 11 | --- busybox-1.16.2.orig/scripts/mkmakefile |
12 | +++ b/scripts/mkmakefile | 12 | +++ busybox-1.16.2/scripts/mkmakefile |
13 | @@ -31,6 +31,9 @@ all: | 13 | @@ -31,6 +31,9 @@ all: |
14 | 14 | ||
15 | Makefile:; | 15 | Makefile:; |
@@ -21,5 +21,36 @@ index 7f9d544..9fc51a7 100755 | |||
21 | +%/: | 21 | +%/: |
22 | \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ | 22 | \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ |
23 | EOF | 23 | EOF |
24 | -- | 24 | Index: busybox-1.16.2/Makefile |
25 | cgit v0.8.2.1 | 25 | =================================================================== |
26 | --- busybox-1.16.2.orig/Makefile | ||
27 | +++ busybox-1.16.2/Makefile | ||
28 | @@ -428,11 +428,15 @@ ifeq ($(config-targets),1) | ||
29 | -include $(srctree)/arch/$(ARCH)/Makefile | ||
30 | export KBUILD_DEFCONFIG | ||
31 | |||
32 | -config %config: scripts_basic outputmakefile FORCE | ||
33 | +config: scripts_basic outputmakefile FORCE | ||
34 | $(Q)mkdir -p include | ||
35 | $(Q)$(MAKE) $(build)=scripts/kconfig $@ | ||
36 | $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease | ||
37 | |||
38 | +%config: scripts_basic outputmakefile FORCE | ||
39 | + $(Q)mkdir -p include | ||
40 | + $(Q)$(MAKE) $(build)=scripts/kconfig $@ | ||
41 | + $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease | ||
42 | else | ||
43 | # =========================================================================== | ||
44 | # Build targets only - this includes busybox, arch specific targets, clean | ||
45 | @@ -1280,7 +1284,10 @@ endif | ||
46 | $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) | ||
47 | |||
48 | # Modules | ||
49 | -/ %/: prepare scripts FORCE | ||
50 | +%/: prepare scripts FORCE | ||
51 | + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ | ||
52 | + $(build)=$(build-dir) | ||
53 | +/: prepare scripts FORCE | ||
54 | $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ | ||
55 | $(build)=$(build-dir) | ||
56 | %.ko: prepare scripts FORCE | ||