update-alternatives: Various fixes

dpkg-native's update-alternatives is broken for offline work so
don't install it.

Also list update-alternatives in the multiprovider whitelist to
avoid unwanted multiple provider warnings when multiple package
backends are enabled.

(From OE-Core rev: 300336fc4a310ed16a14ad041744708d54aae189)

(From OE-Core rev: c90b1faa34e908c7f63e1a64027873858e6d7e8a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 9929b3a734..041737b1d2 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -48,10 +48,18 @@ rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
 }
 
 do_install_append () {
-        mv ${D}${bindir}/update-alternatives ${D}${sbindir}
+        if [ "${PN}" = "dpkg-native" ]; then
+                # update-alternatives doesn't have an offline mode
+                rm ${D}${bindir}/update-alternatives
+        else
+                mv ${D}${bindir}/update-alternatives ${D}${sbindir}
+        fi
 }
 
-PROVIDES += "virtual/update-alternatives"
+PROV = "virtual/update-alternatives"
+PROV_virtclass-native = ""
+
+PROVIDES += "${PROV}"
 
 PACKAGES =+ "update-alternatives-dpkg"
 FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"