diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 12:29:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 12:29:21 +0000 |
| commit | 5de06b564a949d0d9ec254817feacf9ad18d098c (patch) | |
| tree | b24bc7e04e12720c257d88419bdf2fac9475981f | |
| parent | 8903327ff483cd3dbde8cf692be2092462265188 (diff) | |
| download | openembedded-core-5de06b564a949d0d9ec254817feacf9ad18d098c.tar.gz openembedded-core-5de06b564a949d0d9ec254817feacf9ad18d098c.tar.bz2 openembedded-core-5de06b564a949d0d9ec254817feacf9ad18d098c.tar.xz openembedded-core-5de06b564a949d0d9ec254817feacf9ad18d098c.zip | |
Revert "bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues"
Reluctantly revert this since it breaks the tar-native workaround we have
for old versions of tar :(
This reverts commit 01218e29f963120c77885964702198d9bce77e11.
| -rw-r--r-- | meta/classes/sstate.bbclass | 8 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 20e66e274..a8c98e5c7 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -153,12 +153,6 @@ 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" @@ -196,8 +190,6 @@ 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 f140b6bc2..2b0e7ce27 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -402,7 +402,6 @@ 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 |