summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-01-15 11:01:43 +0000
committerJoshua Lock <josh@linux.intel.com>2010-01-15 11:07:49 +0000
commite081a82966e893bd2d82d93ad43a5e34c2852119 (patch)
treebaf3070921ccfc513e625df64fe7507fdfe1bbc7
parent22aadfc3b875b6b662e5b82c4a3db06444785789 (diff)
downloadpoky-e081a82966e893bd2d82d93ad43a5e34c2852119.tar.gz
distros: Fix some warnings by setting PREFERRED_PROVIDER's
opkg-native needs a PREFERRED_PROVIDER for moblin and poky Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta-moblin/conf/distro/moblin.conf1
-rw-r--r--meta/conf/distro/poky.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
index a76e67ec20..503ab2efab 100644
--- a/meta-moblin/conf/distro/moblin.conf
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -81,6 +81,7 @@ PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
81PREFERRED_PROVIDER_gconf ?= "gconf-dbus" 81PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
82PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" 82PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
83PREFERRED_PROVIDER_opkg ?= "opkg" 83PREFERRED_PROVIDER_opkg ?= "opkg"
84PREFERRED_PROVIDER_opkg-native ?= "opkg"
84 85
85require conf/distro/include/moblin-fixed-revisions.inc 86require conf/distro/include/moblin-fixed-revisions.inc
86require conf/distro/include/poky-fixed-revisions.inc 87require conf/distro/include/poky-fixed-revisions.inc
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 3c82929c76..047b647fa3 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -87,6 +87,7 @@ PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
87PREFERRED_PROVIDER_gconf ?= "gconf-dbus" 87PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
88PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" 88PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
89PREFERRED_PROVIDER_opkg ?= "opkg" 89PREFERRED_PROVIDER_opkg ?= "opkg"
90PREFERRED_PROVIDER_opkg-native ?= "opkg"
90 91
91require conf/distro/include/poky-fixed-revisions.inc 92require conf/distro/include/poky-fixed-revisions.inc
92require conf/distro/include/preferred-xorg-versions.inc 93require conf/distro/include/preferred-xorg-versions.inc