From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Mon, 16 Feb 2009 11:59:15 +0000 (+0100)
Subject: bitbake.conf: override XDG_DATA_DIRS to point into our staging area;
X-Git-Tag: Release-2010-05/1~3976^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db0f992c9f1b0abb2f0ca240ce4a7636c9953924;p=openembedded.git

bitbake.conf: override XDG_DATA_DIRS to point into our staging area;
this fixes programs using g_get_system_data_dirs() picking up paths
outside our safe and cozy environment. NOTE: _If_ this breaks some
packages that were previously working, then we are missing something
in do_stage of our native packages and we'd rather see it bailing out
than silently pick up the wrong files. Think 'fail-fast' for glib.
---

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9c187c0757..9aefb63172 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -577,6 +577,8 @@ export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 
+export XDG_DATA_DIRS = "${STAGING_DATADIR}"
+
 export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
 export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip"
 export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"