busybox 1.15.3 / 1.16.2: Drop run-parts.in.usr-bin.patch

Along with the change I made earlier to debianutils (which wasn't
matching upstream Debian wrt locations), we don't need this change
and since run-parts can be used before /usr is mounted, it's not
right technically.

Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch b/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
deleted file mode 100644 (file)
index 6f209ce..0000000
--- a/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
---- busybox-1.15.3.orig//include/applets.h     2009-12-12 22:13:28.000000000 +0100
-+++ busybox-1.15.3/include/applets.h   2010-04-30 15:35:40.000000000 +0200
-@@ -323,7 +323,7 @@
- IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
- IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP))
--IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts))
-+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_USR_BIN, _BB_SUID_DROP, run_parts))
- IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP))
- IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP))

diff --git a/recipes/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch b/recipes/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
deleted file mode 100644 (file)
index 6f209ce..0000000
--- a/recipes/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
---- busybox-1.15.3.orig//include/applets.h     2009-12-12 22:13:28.000000000 +0100
-+++ busybox-1.15.3/include/applets.h   2010-04-30 15:35:40.000000000 +0200
-@@ -323,7 +323,7 @@
- IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
- IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP))
--IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts))
-+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_USR_BIN, _BB_SUID_DROP, run_parts))
- IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP))
- IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP))

diff --git a/recipes/busybox/busybox_1.15.3.bb b/recipes/busybox/busybox_1.15.3.bb
index 477a8ed..0924d3d 100644 (file)
--- a/recipes/busybox/busybox_1.15.3.bb
+++ b/recipes/busybox/busybox_1.15.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
@@ -11,7 +11,6 @@ SRC_URI = "\
   file://get_header_tar.patch \
   file://busybox-appletlib-dependency.patch \
   file://0000-wget-no-check-certificate.patch \
-  file://run-parts.in.usr-bin.patch \
   file://find-touchscreen.sh \
   file://busybox-cron \
   file://busybox-httpd \

diff --git a/recipes/busybox/busybox_1.16.2.bb b/recipes/busybox/busybox_1.16.2.bb
index 6212564..b3fee02 100644 (file)
--- a/recipes/busybox/busybox_1.16.2.bb
+++ b/recipes/busybox/busybox_1.16.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "1"
@@ -14,7 +14,6 @@ SRC_URI = "\
   file://get_header_tar.patch \
   file://busybox-appletlib-dependency.patch \
 #  file://0000-wget-no-check-certificate.patch \
-  file://run-parts.in.usr-bin.patch \
   file://find-touchscreen.sh \
   file://busybox-cron \
   file://busybox-httpd \