summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sstate.bbclass8
-rw-r--r--meta/conf/bitbake.conf1
2 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 0d16d118d..15706541a 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -153,6 +153,12 @@ def sstate_installpkg(ss, d):
bb.mkdirhier(dir)
oe.path.remove(dir)
+ # We're adding binaries into the sysroots, we don't want to execute them
+ # whilst they're half installed or being installed so we need to
+ # remove the sysroots from PATH
+ savedpath = d.getVar("PATH")
+ d.setVar("PATH", "${ORIGPATH}")
+
sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name'])
sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz"
@@ -190,6 +196,8 @@ def sstate_installpkg(ss, d):
# conflict with another writer
os.remove(fixmefn)
+ d.setVar("PATH", savedpath)
+
for state in ss['dirs']:
prepdir(state[1])
os.rename(sstateinst + state[0], state[1])
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 17d2f265d..07982d783 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -401,6 +401,7 @@ EXTRA_IMAGEDEPENDS = ""
# Toolchain info.
##################################################################
+ORIGPATH := "${PATH}"
PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
export PATH