diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-16 22:01:46 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:43:47 +0000 |
commit | 5db4eaac2d5365704974cc6799d54115276e424a (patch) | |
tree | 5881d6a602f39c408a59a7543cd6f9649d3f7ccd | |
parent | f99f36f637a5e20cd4f26b173f8a78d159716e24 (diff) | |
download | poky-5db4eaac2d5365704974cc6799d54115276e424a.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.
(From OE-Core rev: 300336fc4a310ed16a14ad041744708d54aae189)
(From OE-Core rev: c90b1faa34e908c7f63e1a64027873858e6d7e8a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg_svn.bb | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 99d80d840e..08079d1965 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -243,7 +243,7 @@ PROVIDES = "" | |||
243 | PROVIDES_prepend = "${P} ${PF} ${PN} " | 243 | PROVIDES_prepend = "${P} ${PF} ${PN} " |
244 | RPROVIDES = "" | 244 | RPROVIDES = "" |
245 | 245 | ||
246 | MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver" | 246 | MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" |
247 | 247 | ||
248 | SOLIBS = ".so.*" | 248 | SOLIBS = ".so.*" |
249 | SOLIBS_darwin = ".*.dylib" | 249 | SOLIBS_darwin = ".*.dylib" |
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 | |||
48 | } | 48 | } |
49 | 49 | ||
50 | do_install_append () { | 50 | do_install_append () { |
51 | mv ${D}${bindir}/update-alternatives ${D}${sbindir} | 51 | if [ "${PN}" = "dpkg-native" ]; then |
52 | # update-alternatives doesn't have an offline mode | ||
53 | rm ${D}${bindir}/update-alternatives | ||
54 | else | ||
55 | mv ${D}${bindir}/update-alternatives ${D}${sbindir} | ||
56 | fi | ||
52 | } | 57 | } |
53 | 58 | ||
54 | PROVIDES += "virtual/update-alternatives" | 59 | PROV = "virtual/update-alternatives" |
60 | PROV_virtclass-native = "" | ||
61 | |||
62 | PROVIDES += "${PROV}" | ||
55 | 63 | ||
56 | PACKAGES =+ "update-alternatives-dpkg" | 64 | PACKAGES =+ "update-alternatives-dpkg" |
57 | FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" | 65 | FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" |
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb index 8b45a00a6a..f1a0eebcd5 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb | |||
@@ -9,5 +9,5 @@ SRC_URI += "file://noman.patch \ | |||
9 | SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc" | 9 | SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc" |
10 | SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5" | 10 | SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5" |
11 | 11 | ||
12 | PR = "${INC_PR}.0" | 12 | PR = "${INC_PR}.1" |
13 | 13 | ||
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index 8f50f677bd..acb21f2cb9 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb | |||
@@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk" | |||
18 | 18 | ||
19 | SRCREV = "625" | 19 | SRCREV = "625" |
20 | PV = "0.1.8+svnr${SRCPV}" | 20 | PV = "0.1.8+svnr${SRCPV}" |
21 | PR = "r3" | 21 | PR = "r4" |
22 | 22 | ||
23 | PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" | 23 | PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" |
24 | 24 | ||