busybox-{1.11.3,1.7.2,1.9.2}: Fix parallel build failing on appletlib

Roman's patch applies fine on these versions as well.

diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index 305a0b6..bd03aa8 100644 (file)
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -7,6 +7,7 @@ SRC_URI = "\
   file://udhcpscript.patch;patch=1 \
   file://B921600.patch;patch=1 \
   file://fdisk_lineedit_segfault.patch;patch=1 \
+  file://busybox-appletlib-dependency.patch;patch=1 \
   file://busybox-cron \
   file://busybox-httpd \
   file://busybox-udhcpd \

diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 9d6e01c..87d336b 100644 (file)
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
@@ -12,6 +12,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://syslog \
            file://syslog.conf \
            file://udhcpscript.patch;patch=1 \
+           file://busybox-appletlib-dependency.patch;patch=1 \
            file://umount.busybox \
            file://run_parts.c"
 

diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index eb8d372..e9aa820 100644 (file)
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,11 +1,12 @@
 require busybox.inc
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \
            file://adduser-longops.patch;patch=1 \
            file://sort-z-nul.patch;patch=1;status=upstream \
            file://topmem.patch;patch=1 \
+           file://busybox-appletlib-dependency.patch;patch=1 \
            file://busybox-cron \
            file://busybox-httpd \
            file://busybox-udhcpd \

diff --git a/packages/busybox/busybox-1.13.2/busybox-appletlib-dependency.patch b/packages/busybox/files/busybox-appletlib-dependency.patch
similarity index 100%
rename from packages/busybox/busybox-1.13.2/busybox-appletlib-dependency.patch
rename to packages/busybox/files/busybox-appletlib-dependency.patch