summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-11-29 20:15:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-30 22:26:27 +0000
commit3c182d22080e27ecdaf7a04e28caa84fafec5395 (patch)
tree141b046b2782177868126e1e25792ef35c34c498 /meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch
parentef71b02844eb2c286803af12ccd551d6776f211e (diff)
downloadpoky-3c182d22080e27ecdaf7a04e28caa84fafec5395.tar.gz
busybox: add busybox_git.bb recipe
Add busybox_git.bb recipe so that it would be easier to hack with busybox. Set DEFAULT_PREFERENCE to "-1" in the git recipe so that we still use the busybox_1.21.1.bb recipe by default. (From OE-Core rev: d290bbe6d9826fbcfa2e0a7624886284697ed7eb) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch')
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch
deleted file mode 100644
index e8e1edfb7e..0000000000
--- a/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001
4From: Andreas Oberritter <obi@opendreambox.org>
5Date: Sat, 24 Mar 2012 17:36:48 +0100
6Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with
7 procps
8
9Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
10---
11 include/applets.src.h | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14diff --git a/include/applets.src.h b/include/applets.src.h
15index 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--
281.7.5.4
29