diff options
author | Qing He <qing.he@intel.com> | 2011-04-25 14:06:48 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-04 00:54:42 +0100 |
commit | a29b96e3828ecf8a4915856d1e6733a97cd4b89f (patch) | |
tree | 119531cc1adc53b34ea119b1e7a1483d3288dcb9 /meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch | |
parent | b9e63d96addd5fa1d69877e9a58e6ea92482e19b (diff) | |
download | ast2050-yocto-poky-a29b96e3828ecf8a4915856d1e6733a97cd4b89f.zip ast2050-yocto-poky-a29b96e3828ecf8a4915856d1e6733a97cd4b89f.tar.gz |
busybox: upgrade to version 1.18.4
from version 1.17.3
- remove make-382-fix since it's upstreamed
(From OE-Core rev: bb92a1852e17232c07658eef013f243ca6780563)
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch new file mode 100644 index 0000000..e01fdc7 --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch @@ -0,0 +1,27 @@ +# 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 +@@ -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)) |