diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-16 22:01:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-16 22:04:13 +0000 |
| commit | 300336fc4a310ed16a14ad041744708d54aae189 (patch) | |
| tree | 26e6b21e4b9e48e24d1120f0e25244b93da8c595 /meta/recipes-devtools/dpkg/dpkg.inc | |
| parent | dbe154965aa19ba30504895f0abc0575dd67d890 (diff) | |
| download | openembedded-core-contrib-300336fc4a310ed16a14ad041744708d54aae189.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg.inc')
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index a8486d9359..bf345d63d8 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -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" |