diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-11-09 12:18:14 +0000 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-11-09 14:10:31 +0000 |
commit | 4f6d91ec214d9d42ae9477f64dbaceb9477e4d0d (patch) | |
tree | edd179b5a7aca506fc75beb6be7a59a9bb9a4216 /meta | |
parent | 6ac1365aa58e0169a17b250272121088ed3aa47b (diff) | |
download | poky-4f6d91ec214d9d42ae9477f64dbaceb9477e4d0d.tar.gz |
busybox: import upstream patch for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.16.2.bb | 3 |
2 files changed, 27 insertions, 1 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 new file mode 100644 index 0000000000..4ef125d6c0 --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From ef6c6d8cfef071435ccf275ad404a501626b706c Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Chou <thomas@wytron.com.tw> | ||
3 | Date: Tue, 19 Oct 2010 07:17:12 +0000 | ||
4 | Subject: mkmakefile: make 3.82 fix | ||
5 | |||
6 | Signed-off-by: Thomas Chou <thomas@wytron.com.tw> | ||
7 | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> | ||
8 | --- | ||
9 | diff --git a/scripts/mkmakefile b/scripts/mkmakefile | ||
10 | index 7f9d544..9fc51a7 100755 | ||
11 | --- a/scripts/mkmakefile | ||
12 | +++ b/scripts/mkmakefile | ||
13 | @@ -31,6 +31,9 @@ all: | ||
14 | |||
15 | Makefile:; | ||
16 | |||
17 | -\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/: | ||
18 | +\$(filter-out all Makefile,\$(MAKECMDGOALS)): | ||
19 | + \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ | ||
20 | + | ||
21 | +%/: | ||
22 | \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ | ||
23 | EOF | ||
24 | -- | ||
25 | cgit v0.8.2.1 | ||
diff --git a/meta/recipes-core/busybox/busybox_1.16.2.bb b/meta/recipes-core/busybox/busybox_1.16.2.bb index 82a62711e5..6e535027f1 100644 --- a/meta/recipes-core/busybox/busybox_1.16.2.bb +++ b/meta/recipes-core/busybox/busybox_1.16.2.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r2" | 2 | PR = "r3" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://udhcpscript.patch \ | 5 | file://udhcpscript.patch \ |
@@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
8 | file://get_header_tar.patch \ | 8 | file://get_header_tar.patch \ |
9 | file://busybox-appletlib-dependency.patch \ | 9 | file://busybox-appletlib-dependency.patch \ |
10 | file://run-parts.in.usr-bin.patch \ | 10 | file://run-parts.in.usr-bin.patch \ |
11 | file://make-382-fix.patch \ | ||
11 | file://find-touchscreen.sh \ | 12 | file://find-touchscreen.sh \ |
12 | file://busybox-cron \ | 13 | file://busybox-cron \ |
13 | file://busybox-httpd \ | 14 | file://busybox-httpd \ |