From 01218e29f963120c77885964702198d9bce77e11 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 21 Mar 2012 10:44:43 +0000 Subject: 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 --- meta/classes/sstate.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'meta/classes/sstate.bbclass') 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]) -- cgit v1.2.3-54-g00ecf