Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'jb48950' into 'master'
[packaging] Add procps support. JB#48950 See merge request mer-core/busybox!22
- Loading branch information
Showing
3 changed files
with
72 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
commit 0972a8d9725e1fa65fdfb87a5d0509cb8bef0bde (HEAD) | ||
Author: Boleslaw Tokarski <boleslaw.tokarski@jollamobile.com> | ||
Date: Tue Aug 4 15:22:35 2020 +0100 | ||
|
||
Align watch with what is in procps-ng | ||
|
||
diff --git a/procps/watch.c b/procps/watch.c | ||
index 059eb1dda..3ea55fd81 100644 | ||
--- a/procps/watch.c | ||
+++ b/procps/watch.c | ||
@@ -14,7 +14,7 @@ | ||
//config: watch is used to execute a program periodically, showing | ||
//config: output to the screen. | ||
|
||
-//applet:IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP)) | ||
+//applet:IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
|
||
//kbuild:lib-$(CONFIG_WATCH) += watch.o | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters