summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndy Ross <andy.ross@windriver.com>2012-09-18 14:38:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:47:07 +0100
commit2e24eb2cb733f6b96c51b99de4b3194d701dd4c5 (patch)
tree5ba090a13d7ff195a74ce80d9b5f40fd50fb5551 /meta
parent4b40886d4c3ef80f9dcb2e8d4fd807d0039e79f6 (diff)
downloadpoky-2e24eb2cb733f6b96c51b99de4b3194d701dd4c5.tar.gz
busybox: add /usr/bin/stat applet
The busybox defconfig lacks a stat tool, the functionality of which cannot be reproduced in a way accessible to a shell script running in a minimal configuration. Enable, and modify the installation path to /usr/bin/stat to match the coreutils tool for proper alternatives handling. (From OE-Core rev: ef7e1239b95dbef4e461007d6d0612c27a7919ec) Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/defconfig4
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch21
-rw-r--r--meta/recipes-core/busybox/busybox_1.20.2.bb5
3 files changed, 26 insertions, 4 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/defconfig b/meta/recipes-core/busybox/busybox-1.20.2/defconfig
index dff07f179a..b39234fb7d 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.20.2/defconfig
@@ -270,8 +270,8 @@ CONFIG_SORT=y
270CONFIG_FEATURE_SORT_BIG=y 270CONFIG_FEATURE_SORT_BIG=y
271# CONFIG_SPLIT is not set 271# CONFIG_SPLIT is not set
272# CONFIG_FEATURE_SPLIT_FANCY is not set 272# CONFIG_FEATURE_SPLIT_FANCY is not set
273# CONFIG_STAT is not set 273CONFIG_STAT=y
274# CONFIG_FEATURE_STAT_FORMAT is not set 274CONFIG_FEATURE_STAT_FORMAT=y
275CONFIG_STTY=y 275CONFIG_STTY=y
276# CONFIG_SUM is not set 276# CONFIG_SUM is not set
277CONFIG_SYNC=y 277CONFIG_SYNC=y
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch b/meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch
new file mode 100644
index 0000000000..4049324e8b
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch
@@ -0,0 +1,21 @@
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: */
diff --git a/meta/recipes-core/busybox/busybox_1.20.2.bb b/meta/recipes-core/busybox/busybox_1.20.2.bb
index 3814dcfa6b..4c0946af1f 100644
--- a/meta/recipes-core/busybox/busybox_1.20.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.20.2.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r2" 2PR = "r3"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://B921600.patch \ 5 file://B921600.patch \
@@ -26,7 +26,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
26 file://defconfig \ 26 file://defconfig \
27 file://busybox-mkfs-minix-tests_bigendian.patch \ 27 file://busybox-mkfs-minix-tests_bigendian.patch \
28 file://fix-for-spurious-testsuite-failure.patch \ 28 file://fix-for-spurious-testsuite-failure.patch \
29 file://busybox-1.20.2-kernel_ver.patch" 29 file://busybox-1.20.2-kernel_ver.patch \
30 file://stat-usr-bin.patch"
30 31
31SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c" 32SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c"
32SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882" 33SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882"