131e5e7e8f
Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. (From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
Upstream-Status: Inappropriate [configuration]
|
|
|
|
# copy commit message from OE as the patch comment:
|
|
# commit f1b326c83be0d95571b991d8d2ee239982380b6b
|
|
# Author: Martin Jansa <Martin.Jansa@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
|
|
#
|
|
# Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
#
|
|
# Poky doesn't have debianutils, but let's keep it for safety
|
|
# above comment added by Kevin Tian <kevin.tian@intel.com>, 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
|
|
@@ -304,7 +304,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_SBIN, 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))
|