[oe-commits] Martin Jansa : busybox: add patch for installing run-parts to /usr/bin/ instead of /bin

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: f1b326c83be0d95571b991d8d2ee239982380b6b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f1b326c83be0d95571b991d8d2ee239982380b6b

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr 30 15:37:38 2010 +0200

busybox: add patch for installing run-parts to /usr/bin/ instead of /bin

* otherwise debianutils install will fail with
  update-alternatives: Error: cannot register alternative run-parts to /usr/bin/run-parts since it is already registered to /bin/run-parts

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../busybox-1.15.3/run-parts.in.usr-bin.patch      |   12 ++++++++++++
 recipes/busybox/busybox_1.15.3.bb                  |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)

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
new file mode 100644
index 0000000..6f209ce
--- /dev/null
+++ b/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
@@ -0,0 +1,12 @@
+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 1e1aa1e..dbf60af 100644
--- 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}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
@@ -10,6 +10,7 @@ SRC_URI = "\
   file://get_header_tar.patch;patch=1 \
   file://busybox-appletlib-dependency.patch;patch=1 \
   file://0000-wget-no-check-certificate.patch;patch=1 \
+  file://run-parts.in.usr-bin.patch;patch=1 \
   file://find-touchscreen.sh \
   file://busybox-cron \
   file://busybox-httpd \