From 04c412803b7faf7ac87621be2c03b1f17a1f6c8c Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 26 Jul 2012 17:24:04 -0700 Subject: procps: cleanup update-alternatives deprecated code Signed-off-by: Saul Wold --- meta/recipes-extended/procps/procps.inc | 9 +++++++-- meta/recipes-extended/procps/procps_3.2.8.bb | 9 +-------- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'meta/recipes-extended') 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" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ file://install.patch" -inherit autotools +inherit autotools update-alternatives FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" FILES_SOLIBSDEV = "" -FILES_${PN} += "" + +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_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 @@ require procps.inc -PR = "r8" - -inherit update-alternatives - -ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \ - ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \ - ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch" -ALTERNATIVE_PRIORITY = "110" +PR = "r9" SRC_URI += "file://procmodule.patch \ file://psmodule.patch \ -- cgit 1.2.3-korg