diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-23 17:37:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 17:47:41 +0000 |
commit | 8132ac5f6cae22a3184ffbf6d23d0371b0d1ce5f (patch) | |
tree | bb3db5b3a5362f1f6076a8f9213748850e93307b /meta/recipes-extended/procps | |
parent | b2c6e1ead7152e55030d4dce3d6333326643871d (diff) | |
download | poky-8132ac5f6cae22a3184ffbf6d23d0371b0d1ce5f.tar.gz |
procps: use update-alternatives for pwdx, pgrep and watch
* pwdx, pgrep and watch may be provided by busybox.
* Use update-alternatives to avoid conflict.
(From OE-Core rev: 68dc2a3fa30c03a196d650de34d0c657a7b85454)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/procps')
-rw-r--r-- | meta/recipes-extended/procps/procps_3.2.8.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb index 27d2b5ca46..683badc2f9 100644 --- a/meta/recipes-extended/procps/procps_3.2.8.bb +++ b/meta/recipes-extended/procps/procps_3.2.8.bb | |||
@@ -1,11 +1,12 @@ | |||
1 | require procps.inc | 1 | require procps.inc |
2 | 2 | ||
3 | PR = "r5" | 3 | PR = "r6" |
4 | 4 | ||
5 | inherit update-alternatives | 5 | inherit update-alternatives |
6 | 6 | ||
7 | ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \ | 7 | ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \ |
8 | ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps" | 8 | ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \ |
9 | ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch" | ||
9 | ALTERNATIVE_PRIORITY = "110" | 10 | ALTERNATIVE_PRIORITY = "110" |
10 | 11 | ||
11 | SRC_URI += "file://procmodule.patch \ | 12 | SRC_URI += "file://procmodule.patch \ |