From d48585caf9cf13c06eabc068b3c3a17a3f92636d Mon Sep 17 00:00:00 2001 From: Radu Moisan Date: Wed, 22 Aug 2012 12:22:22 +0300 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../busybox-1.20.2/run-parts.in.usr-bin.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch (limited to 'meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch') 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 @@ +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