diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-07-05 10:29:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
commit | 131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (patch) | |
tree | cde6580df91d24345c12bac7b171e2d0d35d8d17 /meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch | |
parent | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (diff) | |
download | poky-131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0.tar.gz |
busybox: upgrade to stable 1.21.1
Merged or backported patches are dropped.
The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's
about the -P option behavior, and it's not accepted, so I dropped
this patch too.
(From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f)
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-1.21.1/stat-usr-bin.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch new file mode 100644 index 0000000000..4049324e8b --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | busybox: move /bin/stat to /usr/bin/stat to match coreutils | ||
2 | |||
3 | The coreutils stat binary lives in /usr/bin, fix busybox to use the same path so | ||
4 | they can be properly tracked by alternatives. | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded] | ||
7 | Signed-off-by: Andy Ross <andy.ross@windriver.com> | ||
8 | |||
9 | diff --git a/include/applets.src.h b/include/applets.src.h | ||
10 | index 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: */ | ||