summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 17:24:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:26:35 +0100
commit03c4940ec974b03baa5b0cd6d3513477ba2f40cb (patch)
treec1a7995eb06a8f4689d442f2d9abb9a8786c5b5d
parent38cab7c5f1a101eb601246957643c4c093de9054 (diff)
downloadpoky-03c4940ec974b03baa5b0cd6d3513477ba2f40cb.tar.gz
procps: cleanup update-alternatives deprecated code
(From OE-Core rev: 04c412803b7faf7ac87621be2c03b1f17a1f6c8c) 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.inc9
-rw-r--r--meta/recipes-extended/procps/procps_3.2.8.bb9
2 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc
index 80080fc488..6ee4a04f81 100644
--- a/meta/recipes-extended/procps/procps.inc
+++ b/meta/recipes-extended/procps/procps.inc
@@ -13,8 +13,13 @@ DEPENDS = "ncurses"
13SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ 13SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
14 file://install.patch" 14 file://install.patch"
15 15
16inherit autotools 16inherit autotools update-alternatives
17 17
18FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" 18FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
19FILES_SOLIBSDEV = "" 19FILES_SOLIBSDEV = ""
20FILES_${PN} += "" 20
21ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch"
22ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
23ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
24ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps"
25ALTERNATIVE_PRIORITY = "110"
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index 5508eb05b3..7b011a0147 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,13 +1,6 @@
1require procps.inc 1require procps.inc
2 2
3PR = "r8" 3PR = "r9"
4
5inherit update-alternatives
6
7ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
8 ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \
9 ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch"
10ALTERNATIVE_PRIORITY = "110"
11 4
12SRC_URI += "file://procmodule.patch \ 5SRC_URI += "file://procmodule.patch \
13 file://psmodule.patch \ 6 file://psmodule.patch \