sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

gconf: add gconftool-2 native wrapper 

This is needed when sstate cache is fetched from another build server.
In this case, the postinstall will fail because the backend libraries
path will be from the build server.

(From OE-Core rev: bba414bc9d14eb2d29b54c68259d13ddbe6567fa)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Laurentiu Palcu 2012-12-17 14:32:42 +02:00 committed by Richard Purdie
parent 4606a8b1fb
commit 359eb5194c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/classes/gconf.bbclass
View File

@ -15,7 +15,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1"
gconf_postinst() {
if [ "x$D" != "x" ]; then
export GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults"
else
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`

7
meta/recipes-gnome/gnome/gconf_3.2.3.bb
View File

@ -9,7 +9,7 @@ POLKIT_libc-uclibc = ""
DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
PR = "r12"
PR = "r13"
inherit gnomebase gtk-doc
@ -37,6 +37,11 @@ do_install_append() {
rm -f ${D}${libdir}/gio/*/*.*a
}
do_install_append_class-native() {
create_wrapper ${D}/${bindir}/gconftool-2 \
GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
}
# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
RDEPENDS_${PN}_class-native = ""