summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-01-22 10:39:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 11:22:12 +0000
commitb1ea3455379e38d4e56970505c05b4104d5f1234 (patch)
tree0900ad3eef7a6bd6d31d18abf0ce932e819da9cb /meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
parent47208175027686339dd18df52b60ec2c43594918 (diff)
downloadpoky-b1ea3455379e38d4e56970505c05b4104d5f1234.tar.gz
busybox: upgrade to stable 1.22.1
Upgrade busybox to the stable release 1.22.1. During this upgrade, 9 patches are removed. Reasons are detailed below. The following 6 patches are removed as they have been merged. meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch The following three patches are removed because they are mainly about moving binaries from /bin to /usr/bin to make the update-alternative work correctly at rootfs time. We can easily solve this problem by changing recipes. There's no compelling reason why such patches are needed. meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch meta/recipes-core/busybox/busybox/stat-usr-bin.patch meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch (From OE-Core rev: fa282186d82e8fe3c590d4ea79e464116e5ceea2) 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/run-parts.in.usr-bin.patch')
-rw-r--r--meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
deleted file mode 100644
index 45f69a937c..0000000000
--- a/meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-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
18diff -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))