From c63d241d15608ac431a1d716ec84ef568928cf85 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Thu, 16 Jan 2014 17:59:26 +0000 Subject: opkg: No longer PROVIDES update-alternatives The new provider is the opkg-utils recipe. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg/opkg.inc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'meta/recipes-devtools/opkg') 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 = "\ --with-opkglibdir=${OPKGLIBDIR} \ " -PROVIDES += "virtual/update-alternatives" -RPROVIDES_update-alternatives-cworth += "update-alternatives" -RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg" RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" RREPLACES_${PN} = "opkg-nogpg" -PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" +PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg" -FILES_update-alternatives-cworth = "${bindir}/update-alternatives" FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg" FILES_libopkg-staticdev = "${libdir}/*.a" FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" @@ -74,10 +70,8 @@ do_install_append() { ln -sf opkg-cl ${D}${bindir}/opkg } -do_install_append_class-native() { - if [ "${PREFERRED_PROVIDER_virtual/update-alternatives-native}" != "${PN}" ]; then - rm ${D}${bindir}/update-alternatives - fi +do_install_append() { + rm ${D}${bindir}/update-alternatives } pkg_postinst_${PN} () { -- cgit 1.2.3-korg