diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-11-01 14:46:43 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:35:30 +0000 |
| commit | f952b1bc8a4f307e2e2f3941f50becd72d88421d (patch) | |
| tree | 74609b7a55625b1ebd0f0b8775424abdc3848361 /meta/conf | |
| parent | b4457a9605988feecadfd49df22ef57245c4cd86 (diff) | |
| download | openembedded-core-f952b1bc8a4f307e2e2f3941f50becd72d88421d.tar.gz openembedded-core-f952b1bc8a4f307e2e2f3941f50becd72d88421d.tar.bz2 openembedded-core-f952b1bc8a4f307e2e2f3941f50becd72d88421d.zip | |
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.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 2 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 2 |
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" # PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" -PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" PREFERRED_PROVIDER_libgcc ?= "libgcc" PREFERRED_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}" BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}" -BBCLASSEXTEND_append_pn-gconf-dbus = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-gconf = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}" |