[OE-core] [PATCH 3/3] opkg: No longer PROVIDES update-alternatives

[Saul Wold]

On 01/14/2014 06:17 PM, Paul Barker wrote:
> The new provider is the opkg-utils recipe.
>
This seems to have triggered a failure on the AB:

| Computing transaction...error: Can't install 
nativesdk-shadow-4.1.4.3-r13 at i686_nativesdk: no package provides 
nativesdk-update-alternatives-opkg

Sau!


> Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
> ---
>   meta/recipes-devtools/opkg/opkg.inc | 12 +++---------
>   1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
> index c9fb505..527fe5d 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} () {
>