sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Richard Purdie 2011-11-16 22:01:46 +00:00
parent f99f36f637
commit 5db4eaac2d
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/bitbake.conf
View File

@ -243,7 +243,7 @@ PROVIDES = ""
PROVIDES_prepend = "${P} ${PF} ${PN} "
RPROVIDES = ""
MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver"
MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver virtual/update-alternatives-native virtual/update-alternatives"
SOLIBS = ".so.*"
SOLIBS_darwin = ".*.dylib"

12
meta/recipes-devtools/dpkg/dpkg.inc
View File

@ -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"

2
meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
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"

2
meta/recipes-devtools/opkg/opkg_svn.bb
View File

@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk"
SRCREV = "625"
PV = "0.1.8+svnr${SRCPV}"
PR = "r3"
PR = "r4"
PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"