diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-01-15 11:01:43 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-01-15 11:07:49 +0000 |
| commit | e081a82966e893bd2d82d93ad43a5e34c2852119 (patch) | |
| tree | baf3070921ccfc513e625df64fe7507fdfe1bbc7 | |
| parent | 22aadfc3b875b6b662e5b82c4a3db06444785789 (diff) | |
| download | poky-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.conf | 1 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 1 |
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" | |||
| 81 | PREFERRED_PROVIDER_gconf ?= "gconf-dbus" | 81 | PREFERRED_PROVIDER_gconf ?= "gconf-dbus" |
| 82 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" | 82 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" |
| 83 | PREFERRED_PROVIDER_opkg ?= "opkg" | 83 | PREFERRED_PROVIDER_opkg ?= "opkg" |
| 84 | PREFERRED_PROVIDER_opkg-native ?= "opkg" | ||
| 84 | 85 | ||
| 85 | require conf/distro/include/moblin-fixed-revisions.inc | 86 | require conf/distro/include/moblin-fixed-revisions.inc |
| 86 | require conf/distro/include/poky-fixed-revisions.inc | 87 | require 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" | |||
| 87 | PREFERRED_PROVIDER_gconf ?= "gconf-dbus" | 87 | PREFERRED_PROVIDER_gconf ?= "gconf-dbus" |
| 88 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" | 88 | PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" |
| 89 | PREFERRED_PROVIDER_opkg ?= "opkg" | 89 | PREFERRED_PROVIDER_opkg ?= "opkg" |
| 90 | PREFERRED_PROVIDER_opkg-native ?= "opkg" | ||
| 90 | 91 | ||
| 91 | require conf/distro/include/poky-fixed-revisions.inc | 92 | require conf/distro/include/poky-fixed-revisions.inc |
| 92 | require conf/distro/include/preferred-xorg-versions.inc | 93 | require conf/distro/include/preferred-xorg-versions.inc |