aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-10-20 20:14:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-24 12:42:40 +0100
commit646599a1f3d39238ba8009993750a46ae220e762 (patch)
tree7f40c8ba471d801b917c3fd25f2419c86934ad69
parent656f09accfd7651f179e02c12f40f4d3bec0be0c (diff)
downloadopenembedded-core-contrib-646599a1f3d39238ba8009993750a46ae220e762.tar.gz
openembedded-core-contrib-646599a1f3d39238ba8009993750a46ae220e762.tar.bz2
openembedded-core-contrib-646599a1f3d39238ba8009993750a46ae220e762.zip
lib/oe/rootfs: tell intercepts where the native sysroot is
Some intercepts may want to access files in the native sysroot that are not on $PATH (such as something in $libexecdir) but any use of STAGING_DIR_NATIVE in the postinst that calls the intercept will be "baked" into the package, so if sstate is reused it will use paths that may not exist. Solve this by exporting the location of the native sysroot in the environment so the postinst and intercept can use an environment variable instead of a bitbake variable. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oe/rootfs.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index f7daf32e759..18df22d9a7e 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -279,6 +279,7 @@ class Rootfs(object):
bb.note("Running intercept scripts:")
os.environ['D'] = self.image_rootfs
+ os.environ['STAGING_DIR_NATIVE'] = self.d.getVar('STAGING_DIR_NATIVE', True)
for script in os.listdir(intercepts_dir):
script_full = os.path.join(intercepts_dir, script)