diff options
| -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 20e66e2742..a8c98e5c7f 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -153,12 +153,6 @@ def sstate_installpkg(ss, d): | |||
| 153 | bb.mkdirhier(dir) | 153 | bb.mkdirhier(dir) |
| 154 | oe.path.remove(dir) | 154 | oe.path.remove(dir) |
| 155 | 155 | ||
| 156 | # We're adding binaries into the sysroots, we don't want to execute them | ||
| 157 | # whilst they're half installed or being installed so we need to | ||
| 158 | # remove the sysroots from PATH | ||
| 159 | savedpath = d.getVar("PATH") | ||
| 160 | d.setVar("PATH", "${ORIGPATH}") | ||
| 161 | |||
| 162 | sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name']) | 156 | sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name']) |
| 163 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz" | 157 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz" |
| 164 | 158 | ||
| @@ -196,8 +190,6 @@ def sstate_installpkg(ss, d): | |||
| 196 | # conflict with another writer | 190 | # conflict with another writer |
| 197 | os.remove(fixmefn) | 191 | os.remove(fixmefn) |
| 198 | 192 | ||
| 199 | d.setVar("PATH", savedpath) | ||
| 200 | |||
| 201 | for state in ss['dirs']: | 193 | for state in ss['dirs']: |
| 202 | prepdir(state[1]) | 194 | prepdir(state[1]) |
| 203 | os.rename(sstateinst + state[0], state[1]) | 195 | 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 = "" | |||
| 402 | # Toolchain info. | 402 | # Toolchain info. |
| 403 | ################################################################## | 403 | ################################################################## |
| 404 | 404 | ||
| 405 | ORIGPATH := "${PATH}" | ||
| 406 | 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}:" | 405 | 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}:" |
| 407 | export PATH | 406 | export PATH |
| 408 | 407 | ||
