summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-01-22 10:39:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 11:22:12 +0000
commit5baa8bea911a075e942fd7af955db5d157c926c8 (patch)
tree87555c81954aa262ffd2d16e5c1faa5c7e88be26
parent95ff97e659265408c63c7aec62c62a494ff59705 (diff)
downloadpoky-5baa8bea911a075e942fd7af955db5d157c926c8.tar.gz
procps: make the 'watch' command register to /bin/watch
This solves the integration problem with busybox. Previously, there was a patch in busybox to move 'watch' to /usr/bin. Such patch is not accepted by upsteam and really not necessary as our ALTERNATIVE system can easily solve such intergration problem. (From OE-Core rev: 9e6e2aee21ff59687ddfd0e23fd0add9ee81d397) 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>
-rw-r--r--meta/recipes-extended/procps/procps.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc
index 6ee4a04f81..20d5fc2be2 100644
--- a/meta/recipes-extended/procps/procps.inc
+++ b/meta/recipes-extended/procps/procps.inc
@@ -15,6 +15,10 @@ SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
15 15
16inherit autotools update-alternatives 16inherit autotools update-alternatives
17 17
18do_install_append() {
19 mv ${D}${bindir}/watch ${D}${bindir}/watch.${BPN}
20}
21
18FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" 22FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
19FILES_SOLIBSDEV = "" 23FILES_SOLIBSDEV = ""
20 24
@@ -22,4 +26,6 @@ ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch"
22ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 26ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
23ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl" 27ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
24ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" 28ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps"
29ALTERNATIVE_LINK_NAME[watch] = "${base_bindir}/watch"
30ALTERNATIVE_TARGET[watch] = "${bindir}/watch.${BPN}"
25ALTERNATIVE_PRIORITY = "110" 31ALTERNATIVE_PRIORITY = "110"