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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 0 insertions, 9 deletions

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 20e66e2742..a8c98e5c7f 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 f140b6bc22..2b0e7ce276 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