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>

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index f7daf32e7591881992ca4ee0138e7497158bb8ad..18df22d9a7e3f586716608cf081a40aaecde478f 100644 (file)
--- 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)