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)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-11-16 22:01:46 +00:00
parent 217a90f2ab
commit 5e109fc37e
4 changed files with 14 additions and 6 deletions

View File

@@ -2,7 +2,7 @@ DESCRIPTION = "Package maintenance system for Debian."
LICENSE = "GPL"
SECTION = "base"
INC_PR = "r10"
INC_PR = "r11"
SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \
file://ignore_extra_fields.patch"
@@ -47,10 +47,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"

View File

@@ -9,5 +9,5 @@ SRC_URI += "file://noman.patch \
SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
PR = "${INC_PR}.0"
PR = "${INC_PR}.1"