[OE-core] [PATCH] gconf.bbclass: don't register schemas in the install stage

Saul Wold sgw at linux.intel.com
Thu Jun 28 17:14:53 UTC 2012


On 06/26/2012 03:10 AM, Ross Burton wrote:
> Previously this was installing schemas in the sysroot, which is wrong for native
> packages as nothing should touch the sysroot directly, and even more wrong for
> non-native packages as the sysroot is irrelevant.
>
> So, export the environment variable that stops the registration happening at
> install time. The postinst script will handle the non-native case, and for the
> sysroot I've opened #2648.  This isn't a massive problem as nothing to my
> knowledge actually installs schemas to the sysroot.
>
> [YOCTO #2245]
>
> Signed-off-by: Ross Burton<ross.burton at intel.com>
> ---
>   meta/classes/gconf.bbclass |   12 ++++++++++--
>   1 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
> index a966c26..fb9f701 100644
> --- a/meta/classes/gconf.bbclass
> +++ b/meta/classes/gconf.bbclass
> @@ -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

Merged into OE-Core - Still needs to be merged to 1.2.1

Thanks
	Sau!




More information about the Openembedded-core mailing list