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:43:45 +0100 |
| commit | a2f31a6a6accb8eee2084cb39edb8e9af4b4189f (patch) | |
| tree | 86e19580a8d52f855dcb30db80f7466465c6896c /meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch | |
| parent | f119566477243ce43b727492dc78b9cb3dd76de4 (diff) | |
| download | openembedded-core-a2f31a6a6accb8eee2084cb39edb8e9af4b4189f.tar.gz openembedded-core-a2f31a6a6accb8eee2084cb39edb8e9af4b4189f.tar.bz2 openembedded-core-a2f31a6a6accb8eee2084cb39edb8e9af4b4189f.zip | |
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.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 @@ +busybox: move /bin/stat to /usr/bin/stat to match coreutils + +The coreutils stat binary lives in /usr/bin, fix busybox to use the same path so +they can be properly tracked by alternatives. + +Upstream-Status: Inappropriate [embedded] +Signed-off-by: Andy Ross <andy.ross@windriver.com> + +diff --git a/include/applets.src.h b/include/applets.src.h +index 0d33bfc..30ae3ad 100644 +--- a/include/applets.src.h ++++ b/include/applets.src.h +@@ -340,7 +340,7 @@ IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, soft + IF_SORT(APPLET_NOEXEC(sort, sort, BB_DIR_USR_BIN, BB_SUID_DROP, sort)) + IF_SPLIT(APPLET(split, BB_DIR_USR_BIN, BB_SUID_DROP)) + IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon)) +-IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP)) ++IF_STAT(APPLET(stat, BB_DIR_USR_BIN, BB_SUID_DROP)) + IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP)) + IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP)) + /* Needs to be run by root or be suid root - needs to change uid and gid: */ |