summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc12
1 files changed, 3 insertions, 9 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index c9fb505bd3..527fe5dac0 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -39,17 +39,13 @@ EXTRA_OECONF = "\
39 --with-opkglibdir=${OPKGLIBDIR} \ 39 --with-opkglibdir=${OPKGLIBDIR} \
40" 40"
41 41
42PROVIDES += "virtual/update-alternatives"
43RPROVIDES_update-alternatives-cworth += "update-alternatives"
44RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
45RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" 42RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
46RDEPENDS_${PN}_class-native = "" 43RDEPENDS_${PN}_class-native = ""
47RDEPENDS_${PN}_class-nativesdk = "" 44RDEPENDS_${PN}_class-nativesdk = ""
48RREPLACES_${PN} = "opkg-nogpg" 45RREPLACES_${PN} = "opkg-nogpg"
49 46
50PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" 47PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg"
51 48
52FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
53FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg" 49FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg"
54FILES_libopkg-staticdev = "${libdir}/*.a" 50FILES_libopkg-staticdev = "${libdir}/*.a"
55FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" 51FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
@@ -74,10 +70,8 @@ do_install_append() {
74 ln -sf opkg-cl ${D}${bindir}/opkg 70 ln -sf opkg-cl ${D}${bindir}/opkg
75} 71}
76 72
77do_install_append_class-native() { 73do_install_append() {
78 if [ "${PREFERRED_PROVIDER_virtual/update-alternatives-native}" != "${PN}" ]; then 74 rm ${D}${bindir}/update-alternatives
79 rm ${D}${bindir}/update-alternatives
80 fi
81} 75}
82 76
83pkg_postinst_${PN} () { 77pkg_postinst_${PN} () {