summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-11-01 14:46:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:37:11 +0000
commitd4d29f7e58b0e86c6ac91d05730e319fe1706aa2 (patch)
tree8bc7e520819e32a4f6b58fa8d4d55b9a52c364d9 /meta/conf
parent1ab3d1b5489eeaff78add14f4886269c690a3d46 (diff)
downloadpoky-d4d29f7e58b0e86c6ac91d05730e319fe1706aa2.tar.gz
gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
The D-Bus backend has been integrated into upstream GConf so we can switch to upstream and drop gconf-dbus. I've gone for a release in the 3.2 series as we disable Gtk+, and therefore are not impacted by the gtk+3 changes, and the D-Bus backend was unstable before this release. (From OE-Core rev: f952b1bc8a4f307e2e2f3941f50becd72d88421d) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/default-providers.inc2
-rw-r--r--meta/conf/multilib.conf2
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index be23d364f3..afea5e7c50 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
21# 21#
22PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" 22PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
23PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" 23PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
24PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
25PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native"
26PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" 24PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
27PREFERRED_PROVIDER_libgcc ?= "libgcc" 25PREFERRED_PROVIDER_libgcc ?= "libgcc"
28PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk" 26PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 5e4b4354b4..de535402f0 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = " ${MULTILIBS}"
103BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}" 103BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}"
104BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}" 104BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}"
105BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}" 105BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}"
106BBCLASSEXTEND_append_pn-gconf-dbus = " ${MULTILIBS}" 106BBCLASSEXTEND_append_pn-gconf = " ${MULTILIBS}"
107BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}" 107BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}"
108BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}" 108BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}"
109BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}" 109BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}"