[oe-commits] Paul Barker : opkg: Don't use update-alternatives

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c28bb9126eed92c13a50a2557eb48402a9d12537
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c28bb9126eed92c13a50a2557eb48402a9d12537

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Wed Nov 20 16:41:10 2013 +0000

opkg: Don't use update-alternatives

The symlink from 'opkg' to 'opkg-cl' doesn't need to be created with
update-alternatives as there isn't any alternative. Instead it can be created by
hand in do_install_append.

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/opkg/opkg.inc | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 416fb54..1076472 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -68,6 +68,10 @@ do_install_append() {
 			-e 's, at SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
 			${D}${systemd_unitdir}/system/opkg-configure.service
 	fi
+
+	# The installed binary is 'opkg-cl' but people and scripts often expect
+	# it to just be 'opkg'
+	ln -sf opkg-cl ${D}${bindir}/opkg
 }
 
 do_install_append_class-native() {
@@ -96,13 +100,6 @@ rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
 fi
 }
 
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "opkg"
-ALTERNATIVE_LINK_NAME[opkg] = "${bindir}/opkg"
-ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl"
-
 BBCLASSEXTEND = "native nativesdk"
 
 # Define a variable to allow distros to run configure earlier.