summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-11-09 12:18:14 +0000
committerJoshua Lock <josh@linux.intel.com>2010-12-10 16:52:32 +0000
commit261ca885962ba9606bcad4c5415927a79fdd7b96 (patch)
tree529f4900f5dbe50aa43200ada1ec9a8f79a500a4
parent72ddd5c20246a5d5b1752b58a61ef75b4c39cc40 (diff)
downloadpoky-261ca885962ba9606bcad4c5415927a79fdd7b96.tar.gz
busybox: import upstream patch for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch25
-rw-r--r--meta/recipes-core/busybox/busybox_1.16.2.bb3
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 @@
1From ef6c6d8cfef071435ccf275ad404a501626b706c Mon Sep 17 00:00:00 2001
2From: Thomas Chou <thomas@wytron.com.tw>
3Date: Tue, 19 Oct 2010 07:17:12 +0000
4Subject: mkmakefile: make 3.82 fix
5
6Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
7Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
8---
9diff --git a/scripts/mkmakefile b/scripts/mkmakefile
10index 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--
25cgit 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 0952f4ddb0..06fef62605 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 @@
1require busybox.inc 1require busybox.inc
2PR = "r0" 2PR = "r1"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_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 \