diff options
author | Radu Moisan <radu.moisan@intel.com> | 2012-08-22 12:22:22 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-23 11:43:34 +0100 |
commit | d48585caf9cf13c06eabc068b3c3a17a3f92636d (patch) | |
tree | 38f666bb65af6ea7093be2ab418d30256e10fc69 /meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch | |
parent | 8e335f1da265cdb0ea2d5f95b3dfe8c856213c96 (diff) | |
download | poky-d48585caf9cf13c06eabc068b3c3a17a3f92636d.tar.gz |
busybox: Upgrade to upstream 1.20.2
Updated defconfig file from generated .config
Disabled CONFIG_LSOF,CONFIG_CROSS_COMPILER_PREFIX, and CONFIG_EXTRA_CFLAGS
for backwards compatibility.
Added busybox-1.20.2-kernel_ver.patch from upstream.
(From OE-Core rev: e5f2cc805509a23e160c6f05e6776d6d32e3ce98)
Signed-off-by: Radu Moisan <radu.moisan@intel.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.20.2/run-parts.in.usr-bin.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch new file mode 100644 index 0000000000..1fe20d4b0f --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.20.2/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 | @@ -323,7 +323,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_BIN, 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)) | ||