summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJunling Zheng <zhengjunling@huawei.com>2015-06-07 07:52:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:14 +0100
commitd1fc21e5b6c97f389086bf7661e5e1cc524b2197 (patch)
tree7c6477cd46676f3232d82446ee2fd43c986d70b3 /meta/recipes-core
parent47c4e763fb1bb6cdad229240e7a6996be1434135 (diff)
downloadpoky-d1fc21e5b6c97f389086bf7661e5e1cc524b2197.tar.gz
busybox: fix the wrong help text for chown
Only when DESKTOP is enabled, chown has -L, -H and -P options. Backport a commit from upstream to fix it: http://git.busybox.net/busybox/commit/?id=d291c2fdd5cb8616605c67ecbfb04274fa094242. (From OE-Core rev: 6ec65eedb63a82159dde8f2b2825ba7d5e6ae81d) Signed-off-by: Junling Zheng <zhengjunling@huawei.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch34
-rw-r--r--meta/recipes-core/busybox/busybox_1.23.2.bb1
-rw-r--r--meta/recipes-core/busybox/busybox_git.bb1
3 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch b/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch
new file mode 100644
index 0000000000..4299799664
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-chown-fix-help-text.patch
@@ -0,0 +1,34 @@
1From d291c2fdd5cb8616605c67ecbfb04274fa094242 Mon Sep 17 00:00:00 2001
2From: Junling Zheng <zhengjunling@huawei.com>
3Date: Sun, 7 Jun 2015 02:32:23 +0200
4Subject: [PATCH] chown: fix help text
5
6Derived from:
7http://git.busybox.net/busybox/commit/?id=d291c2fdd5cb8616605c67ecbfb04274fa094242.
8
9Only when DESKTOP is enabled, chown has -L, -H and -P options.
10
11Upstream-Status: Backport
12
13Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
14Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
15---
16 coreutils/chown.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/coreutils/chown.c b/coreutils/chown.c
20index cb07bbc..679c0d8 100644
21--- a/coreutils/chown.c
22+++ b/coreutils/chown.c
23@@ -11,7 +11,7 @@
24 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */
25
26 //usage:#define chown_trivial_usage
27-//usage: "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
28+//usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... OWNER[<.|:>[GROUP]] FILE..."
29 //usage:#define chown_full_usage "\n\n"
30 //usage: "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
31 //usage: "\n -R Recurse"
32--
331.8.3.4
34
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb
index f7bf8e2544..85e462ec58 100644
--- a/meta/recipes-core/busybox/busybox_1.23.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.23.2.bb
@@ -31,6 +31,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
31 file://recognize_connmand.patch \ 31 file://recognize_connmand.patch \
32 file://busybox-cross-menuconfig.patch \ 32 file://busybox-cross-menuconfig.patch \
33 file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ 33 file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \
34 file://0001-chown-fix-help-text.patch \
34" 35"
35 36
36SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73" 37SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73"
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index 675e56afd0..c5596d8ed0 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -37,6 +37,7 @@ SRC_URI = "git://busybox.net/busybox.git \
37 file://recognize_connmand.patch \ 37 file://recognize_connmand.patch \
38 file://busybox-cross-menuconfig.patch \ 38 file://busybox-cross-menuconfig.patch \
39 file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ 39 file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \
40 file://0001-chown-fix-help-text.patch \
40" 41"
41 42
42EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" 43EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"