summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 22:01:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:43:47 +0000
commit5db4eaac2d5365704974cc6799d54115276e424a (patch)
tree5881d6a602f39c408a59a7543cd6f9649d3f7ccd /meta/conf
parentf99f36f637a5e20cd4f26b173f8a78d159716e24 (diff)
downloadpoky-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>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 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 = ""
243PROVIDES_prepend = "${P} ${PF} ${PN} " 243PROVIDES_prepend = "${P} ${PF} ${PN} "
244RPROVIDES = "" 244RPROVIDES = ""
245 245
246MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver" 246MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver virtual/update-alternatives-native virtual/update-alternatives"
247 247
248SOLIBS = ".so.*" 248SOLIBS = ".so.*"
249SOLIBS_darwin = ".*.dylib" 249SOLIBS_darwin = ".*.dylib"