From 5baa8bea911a075e942fd7af955db5d157c926c8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 22 Jan 2014 10:39:49 +0800 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps.inc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/recipes-extended') 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 \ inherit autotools update-alternatives +do_install_append() { + mv ${D}${bindir}/watch ${D}${bindir}/watch.${BPN} +} + FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" FILES_SOLIBSDEV = "" @@ -22,4 +26,6 @@ ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl" ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" +ALTERNATIVE_LINK_NAME[watch] = "${base_bindir}/watch" +ALTERNATIVE_TARGET[watch] = "${bindir}/watch.${BPN}" ALTERNATIVE_PRIORITY = "110" -- cgit v1.2.3-54-g00ecf