From 646599a1f3d39238ba8009993750a46ae220e762 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Oct 2015 20:14:12 +0100 Subject: 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 --- meta/lib/oe/rootfs.py | 1 + 1 file changed, 1 insertion(+) 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): 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) -- cgit 1.2.3-korg