diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 10:44:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 14:31:42 +0000 |
| commit | 518dffe20178f5969dddccb17d6ab347afb72beb (patch) | |
| tree | e1fa659c8daf470a1d961b79601faf8200db1f30 | |
| parent | 33046605549501bed9ceff102614d86ba54a5891 (diff) | |
| download | openembedded-core-518dffe20178f5969dddccb17d6ab347afb72beb.tar.gz openembedded-core-518dffe20178f5969dddccb17d6ab347afb72beb.tar.bz2 openembedded-core-518dffe20178f5969dddccb17d6ab347afb72beb.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sstate.bbclass | 8 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 0d16d118d9..15706541ae 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 17d2f265de..07982d783d 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 |