summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox/stat-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/stat-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/stat-usr-bin.patch')
-rw-r--r--meta/recipes-core/busybox/busybox/stat-usr-bin.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/meta/recipes-core/busybox/busybox/stat-usr-bin.patch b/meta/recipes-core/busybox/busybox/stat-usr-bin.patch
deleted file mode 100644
index 4049324e8b..0000000000
--- a/meta/recipes-core/busybox/busybox/stat-usr-bin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1busybox: move /bin/stat to /usr/bin/stat to match coreutils
2
3The coreutils stat binary lives in /usr/bin, fix busybox to use the same path so
4they can be properly tracked by alternatives.
5
6Upstream-Status: Inappropriate [embedded]
7Signed-off-by: Andy Ross <andy.ross@windriver.com>
8
9diff --git a/include/applets.src.h b/include/applets.src.h
10index 0d33bfc..30ae3ad 100644
11--- a/include/applets.src.h
12+++ b/include/applets.src.h
13@@ -340,7 +340,7 @@ IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, soft
14 IF_SORT(APPLET_NOEXEC(sort, sort, BB_DIR_USR_BIN, BB_SUID_DROP, sort))
15 IF_SPLIT(APPLET(split, BB_DIR_USR_BIN, BB_SUID_DROP))
16 IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
17-IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP))
18+IF_STAT(APPLET(stat, BB_DIR_USR_BIN, BB_SUID_DROP))
19 IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
20 IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
21 /* Needs to be run by root or be suid root - needs to change uid and gid: */