diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2013-07-05 10:29:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
| commit | 131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (patch) | |
| tree | cde6580df91d24345c12bac7b171e2d0d35d8d17 /meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch | |
| parent | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (diff) | |
| download | poky-131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0.tar.gz | |
busybox: upgrade to stable 1.21.1
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>
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch')
| -rw-r--r-- | meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch new file mode 100644 index 0000000000..45f69a937c --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | # copy commit message from OE as the patch comment: | ||
| 4 | # commit f1b326c83be0d95571b991d8d2ee239982380b6b | ||
| 5 | # Author: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 6 | # Date: Fri Apr 30 15:37:38 2010 +0200 | ||
| 7 | # | ||
| 8 | # busybox: add patch for installing run-parts to /usr/bin/ instead of /bin | ||
| 9 | # | ||
| 10 | # * otherwise debianutils install will fail with | ||
| 11 | # update-alternatives: Error: cannot register alternative run-parts to /usr/bin/run-parts since it is | ||
| 12 | # | ||
| 13 | # Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 14 | # | ||
| 15 | # Poky doesn't have debianutils, but let's keep it for safety | ||
| 16 | # above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 | ||
| 17 | |||
| 18 | diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/applets.src.h | ||
| 19 | --- busybox-1.15.3.orig//include/applets.src.h 2009-12-12 22:13:28.000000000 +0100 | ||
| 20 | +++ busybox-1.15.3/include/applets.src.h 2010-04-30 15:35:40.000000000 +0200 | ||
| 21 | @@ -304,7 +304,7 @@ | ||
| 22 | IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP)) | ||
| 23 | IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
| 24 | IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP)) | ||
| 25 | -IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts)) | ||
| 26 | +IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_USR_BIN, BB_SUID_DROP, run_parts)) | ||
| 27 | IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
| 28 | IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP)) | ||
| 29 | IF_RUNSV(APPLET(runsv, BB_DIR_USR_BIN, _BB_SUID_DROP)) | ||