diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-05-21 16:17:22 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 12:04:43 +0100 |
commit | 8a4a7a261991d8cf49091472b99c68ac8ccab8f8 (patch) | |
tree | 12ea91465baec78e9ed86323c39bf969aee50ada | |
parent | 6d76d521a124b9b229b1a330cdaf977f434503be (diff) | |
download | poky-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>
-rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 13 |
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" | |||
11 | DEPENDS_virtclass-nativesdk = "curl-nativesdk" | 11 | DEPENDS_virtclass-nativesdk = "curl-nativesdk" |
12 | 12 | ||
13 | PE = "1" | 13 | PE = "1" |
14 | INC_PR = "r9" | 14 | INC_PR = "r10" |
15 | 15 | ||
16 | FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg" | 16 | FILESDIR = "${@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 |
66 | fi | 66 | fi |
67 | |||
68 | update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 | ||
69 | } | 67 | } |
70 | 68 | ||
71 | pkg_postrm_${PN} () { | 69 | inherit update-alternatives |
72 | #!/bin/sh | ||
73 | update-alternatives --remove opkg ${bindir}/opkg-cl | ||
74 | } | ||
75 | 70 | ||
71 | ALTERNATIVE_PRIORITY = "100" | ||
72 | ALTERNATIVE_${PN} = "opkg" | ||
73 | ALTERNATIVE_LINK_NAME[opkg] = "${bindir}/opkg" | ||
74 | ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl" | ||
76 | 75 | ||
77 | BBCLASSEXTEND = "native nativesdk" | 76 | BBCLASSEXTEND = "native nativesdk" |
78 | 77 | ||