From: Mark Hatle <mark.hatle@windriver.com>
Date: Mon, 21 May 2012 21:17:22 +0000 (-0500)
Subject: opkg: use new update-alternatives
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~41324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9c2fd512e592806b10d0273ca490c90072ff3f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

opkg: use new update-alternatives

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---

diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 14083d0cd12..5c7cad36650 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -11,7 +11,7 @@ DEPENDS_virtclass-native = "curl-native"
 DEPENDS_virtclass-nativesdk = "curl-nativesdk"
 
 PE = "1"
-INC_PR = "r9"
+INC_PR = "r10"
 
 FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg"
 
@@ -64,15 +64,14 @@ rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
 " > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
 	chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
 fi
-
-update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
 }
 
-pkg_postrm_${PN} () {
-#!/bin/sh
-update-alternatives --remove opkg ${bindir}/opkg-cl
-}
+inherit update-alternatives
 
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "opkg"
+ALTERNATIVE_LINK_NAME[opkg] = "${bindir}/opkg"
+ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl"
 
 BBCLASSEXTEND = "native nativesdk"