131e5e7e8f
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. (From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
Upstream-Status: Inappropriate [configuration]
|
|
|
|
From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Oberritter <obi@opendreambox.org>
|
|
Date: Sat, 24 Mar 2012 17:36:48 +0100
|
|
Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with
|
|
procps
|
|
|
|
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
|
|
---
|
|
include/applets.src.h | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/include/applets.src.h b/include/applets.src.h
|
|
index 87d9cbb..c148a8c 100644
|
|
--- a/include/applets.src.h
|
|
+++ b/include/applets.src.h
|
|
@@ -404,7 +404,7 @@ IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
|
|
IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
/* Needs to be run by root or be suid root - needs to write to /dev/TTY: */
|
|
IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
|
|
-IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
|
|
+IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP))
|
|
IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
--
|
|
1.7.5.4
|
|
|