diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2013-11-20 16:41:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-24 12:25:32 +0000 |
commit | 6734f82003b38e432a9c47ab3e64b735043557c7 (patch) | |
tree | 3d1f52208cf80794d6a28cf84c2ae6595d20cdcf /meta/recipes-devtools/opkg | |
parent | 9339da20dba6e6c7867b4fb33d0eb7693f5784c1 (diff) | |
download | poky-6734f82003b38e432a9c47ab3e64b735043557c7.tar.gz |
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.
(From OE-Core rev: c28bb9126eed92c13a50a2557eb48402a9d12537)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 416fb549f7..1076472779 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc | |||
@@ -68,6 +68,10 @@ do_install_append() { | |||
68 | -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \ | 68 | -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \ |
69 | ${D}${systemd_unitdir}/system/opkg-configure.service | 69 | ${D}${systemd_unitdir}/system/opkg-configure.service |
70 | fi | 70 | fi |
71 | |||
72 | # The installed binary is 'opkg-cl' but people and scripts often expect | ||
73 | # it to just be 'opkg' | ||
74 | ln -sf opkg-cl ${D}${bindir}/opkg | ||
71 | } | 75 | } |
72 | 76 | ||
73 | do_install_append_class-native() { | 77 | do_install_append_class-native() { |
@@ -96,13 +100,6 @@ rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts | |||
96 | fi | 100 | fi |
97 | } | 101 | } |
98 | 102 | ||
99 | inherit update-alternatives | ||
100 | |||
101 | ALTERNATIVE_PRIORITY = "100" | ||
102 | ALTERNATIVE_${PN} = "opkg" | ||
103 | ALTERNATIVE_LINK_NAME[opkg] = "${bindir}/opkg" | ||
104 | ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl" | ||
105 | |||
106 | BBCLASSEXTEND = "native nativesdk" | 103 | BBCLASSEXTEND = "native nativesdk" |
107 | 104 | ||
108 | # Define a variable to allow distros to run configure earlier. | 105 | # Define a variable to allow distros to run configure earlier. |