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/recipes-core/busybox | |
| parent | 6ac1365aa58e0169a17b250272121088ed3aa47b (diff) | |
| download | openembedded-core-4f6d91ec214d9d42ae9477f64dbaceb9477e4d0d.tar.gz openembedded-core-4f6d91ec214d9d42ae9477f64dbaceb9477e4d0d.tar.bz2 openembedded-core-4f6d91ec214d9d42ae9477f64dbaceb9477e4d0d.tar.xz openembedded-core-4f6d91ec214d9d42ae9477f64dbaceb9477e4d0d.zip | |
busybox: import upstream patch for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/busybox')
| -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 000000000..4ef125d6c --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch @@ -0,0 +1,25 @@ +From ef6c6d8cfef071435ccf275ad404a501626b706c Mon Sep 17 00:00:00 2001 +From: Thomas Chou <thomas@wytron.com.tw> +Date: Tue, 19 Oct 2010 07:17:12 +0000 +Subject: mkmakefile: make 3.82 fix + +Signed-off-by: Thomas Chou <thomas@wytron.com.tw> +Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> +--- +diff --git a/scripts/mkmakefile b/scripts/mkmakefile +index 7f9d544..9fc51a7 100755 +--- a/scripts/mkmakefile ++++ b/scripts/mkmakefile +@@ -31,6 +31,9 @@ all: + + Makefile:; + +-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/: ++\$(filter-out all Makefile,\$(MAKECMDGOALS)): ++ \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ ++ ++%/: + \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ + EOF +-- +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 82a62711e..6e535027f 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 @@ require busybox.inc -PR = "r2" +PR = "r3" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \ @@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://get_header_tar.patch \ file://busybox-appletlib-dependency.patch \ file://run-parts.in.usr-bin.patch \ + file://make-382-fix.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ |