summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-05-21 16:17:22 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 12:04:43 +0100
commit8a4a7a261991d8cf49091472b99c68ac8ccab8f8 (patch)
tree12ea91465baec78e9ed86323c39bf969aee50ada /meta
parent6d76d521a124b9b229b1a330cdaf977f434503be (diff)
downloadpoky-8a4a7a261991d8cf49091472b99c68ac8ccab8f8.tar.gz
opkg: use new update-alternatives
(From OE-Core rev: fc9c2fd512e592806b10d0273ca490c90072ff3f) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 14083d0cd1..5c7cad3665 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -11,7 +11,7 @@ DEPENDS_virtclass-native = "curl-native"
11DEPENDS_virtclass-nativesdk = "curl-nativesdk" 11DEPENDS_virtclass-nativesdk = "curl-nativesdk"
12 12
13PE = "1" 13PE = "1"
14INC_PR = "r9" 14INC_PR = "r10"
15 15
16FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg" 16FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg"
17 17
@@ -64,15 +64,14 @@ rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
64" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 64" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
65 chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts 65 chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
66fi 66fi
67
68update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
69} 67}
70 68
71pkg_postrm_${PN} () { 69inherit update-alternatives
72#!/bin/sh
73update-alternatives --remove opkg ${bindir}/opkg-cl
74}
75 70
71ALTERNATIVE_PRIORITY = "100"
72ALTERNATIVE_${PN} = "opkg"
73ALTERNATIVE_LINK_NAME[opkg] = "${bindir}/opkg"
74ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl"
76 75
77BBCLASSEXTEND = "native nativesdk" 76BBCLASSEXTEND = "native nativesdk"
78 77