From e691f43161191a9e93105a0f1e0155bcdc9b6d06 Mon Sep 17 00:00:00 2001 From: Denis Carikli Date: Tue, 6 Sep 2011 09:39:39 +0200 Subject: busybox: update to 1.8.5 (From OE-Core rev: 77571c4d224d5bcc6be944fe3d00309dafe1d512) Signed-off-by: Denis Carikli Signed-off-by: Richard Purdie --- .../busybox-1.18.5/run-parts.in.usr-bin.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch (limited to 'meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch') diff --git a/meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch new file mode 100644 index 0000000000..7d532e63de --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch @@ -0,0 +1,29 @@ +Upstream-Status: Inappropriate [configuration] + +# copy commit message from OE as the patch comment: +# commit f1b326c83be0d95571b991d8d2ee239982380b6b +# Author: Martin Jansa +# 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 +# +# Signed-off-by: Martin Jansa +# +# Poky doesn't have debianutils, but let's keep it for safety +# above comment added by Kevin Tian , 2010-07-06 + +diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/applets.src.h +--- busybox-1.15.3.orig//include/applets.src.h 2009-12-12 22:13:28.000000000 +0100 ++++ busybox-1.15.3/include/applets.src.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)) -- cgit v1.2.3-54-g00ecf