diff options
author | Radu Moisan <radu.moisan@intel.com> | 2012-08-22 12:22:22 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-23 11:43:34 +0100 |
commit | d48585caf9cf13c06eabc068b3c3a17a3f92636d (patch) | |
tree | 38f666bb65af6ea7093be2ab418d30256e10fc69 /meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch | |
parent | 8e335f1da265cdb0ea2d5f95b3dfe8c856213c96 (diff) | |
download | poky-d48585caf9cf13c06eabc068b3c3a17a3f92636d.tar.gz |
busybox: Upgrade to upstream 1.20.2
Updated defconfig file from generated .config
Disabled CONFIG_LSOF,CONFIG_CROSS_COMPILER_PREFIX, and CONFIG_EXTRA_CFLAGS
for backwards compatibility.
Added busybox-1.20.2-kernel_ver.patch from upstream.
(From OE-Core rev: e5f2cc805509a23e160c6f05e6776d6d32e3ce98)
Signed-off-by: Radu Moisan <radu.moisan@intel.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.20.2/watch.in.usr-bin.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch new file mode 100644 index 0000000000..e8e1edfb7e --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001 | ||
4 | From: Andreas Oberritter <obi@opendreambox.org> | ||
5 | Date: Sat, 24 Mar 2012 17:36:48 +0100 | ||
6 | Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with | ||
7 | procps | ||
8 | |||
9 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
10 | --- | ||
11 | include/applets.src.h | 2 +- | ||
12 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/include/applets.src.h b/include/applets.src.h | ||
15 | index 87d9cbb..c148a8c 100644 | ||
16 | --- a/include/applets.src.h | ||
17 | +++ b/include/applets.src.h | ||
18 | @@ -404,7 +404,7 @@ IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) | ||
19 | IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
20 | /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */ | ||
21 | IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) | ||
22 | -IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP)) | ||
23 | +IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
24 | IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP)) | ||
25 | IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
26 | IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
27 | -- | ||
28 | 1.7.5.4 | ||
29 | |||