diff options
author | Ross Burton <ross.burton@intel.com> | 2015-10-20 20:14:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:24:30 +0000 |
commit | d18d902fae9b9bd1e43bf96f83a3235258da8cd8 (patch) | |
tree | 7108866b88485f4719127d1f78854ffd80c57d14 /meta/lib/oe/rootfs.py | |
parent | 9336e1fd80a4f55f8b19b0120b0748c225f556e8 (diff) | |
download | poky-d18d902fae9b9bd1e43bf96f83a3235258da8cd8.tar.gz |
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.
(From OE-Core rev: 646599a1f3d39238ba8009993750a46ae220e762)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r-- | meta/lib/oe/rootfs.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index f7daf32e75..18df22d9a7 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -279,6 +279,7 @@ class Rootfs(object): | |||
279 | 279 | ||
280 | bb.note("Running intercept scripts:") | 280 | bb.note("Running intercept scripts:") |
281 | os.environ['D'] = self.image_rootfs | 281 | os.environ['D'] = self.image_rootfs |
282 | os.environ['STAGING_DIR_NATIVE'] = self.d.getVar('STAGING_DIR_NATIVE', True) | ||
282 | for script in os.listdir(intercepts_dir): | 283 | for script in os.listdir(intercepts_dir): |
283 | script_full = os.path.join(intercepts_dir, script) | 284 | script_full = os.path.join(intercepts_dir, script) |
284 | 285 | ||