bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues
This resolves issues related to pigz-native when installing from sstate that people have been seeing. It also gives us a way to solve issues like the gzip-native race during sstate package creation covered in Yocto #1774. (From OE-Core rev: 518dffe20178f5969dddccb17d6ab347afb72beb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
42c445bc04
commit
01218e29f9
|
@ -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])
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue