[CONSOLIDATED,PULL,15/20] gconf.bbclass: don't register schemas in the install stage
Submitted by Saul Wold on June 27, 2012, 3:43 p.m.
|
Patch ID: 30759
Details
Commit Message
@@ -1,10 +1,18 @@
DEPENDS += "gconf gconf-native"
-# This is referenced by the gconf m4 macros and would default to the value hardcoded
-# into gconf at compile time otherwise
+# These are for when gconftool is used natively and the prefix isn't necessarily
+# the sysroot. TODO: replicate the postinst logic for -native packages going
+# into sysroot as they won't be running their own install-time schema
+# registration (disabled below) nor the postinst script (as they don't happen).
export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults"
export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2"
+# Disable install-time schema registration as we're a packaging system so this
+# happens in the postinst script, not at install time. Set both the configure
+# script option and the traditional envionment variable just to make sure.
+EXTRA_OECONF += "--disable-schemas-install"
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1"
+
gconf_postinst() {
if [ "x$D" != "x" ]; then
exit 1