diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-06-13 22:09:54 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 18:10:36 +0100 |
| commit | d3059e5d35dcb01641e828c5182615b8fbf1f2e5 (patch) | |
| tree | a96ff8b96cc665dca472a48b6348d654242405a9 /meta/classes | |
| parent | a26ec548aabda74acfdd1e2893b98b47bc513b15 (diff) | |
| download | openembedded-core-d3059e5d35dcb01641e828c5182615b8fbf1f2e5.tar.gz openembedded-core-d3059e5d35dcb01641e828c5182615b8fbf1f2e5.tar.bz2 openembedded-core-d3059e5d35dcb01641e828c5182615b8fbf1f2e5.zip | |
classes/package: save/restore cwd in split_and_strip_files
This function uses chdir() heavily, so save and restore the cwd so that it
doesn't affect the system state.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index c9e2aa81ca..d6204cfee5 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -841,6 +841,9 @@ python split_and_strip_files () { dvar = d.getVar('PKGD', True) pn = d.getVar('PN', True) + oldcwd = os.getcwd() + os.chdir(dvar) + # We default to '.debug' style if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE', True) == 'debug-file-directory': # Single debug-file-directory style debug info @@ -864,8 +867,6 @@ python split_and_strip_files () { sourcefile = d.expand("${WORKDIR}/debugsources.list") bb.utils.remove(sourcefile) - os.chdir(dvar) - # Return type (bits): # 0 - not elf # 1 - ELF @@ -1052,6 +1053,7 @@ python split_and_strip_files () { # # End of strip # + os.chdir(oldcwd) } python populate_packages () { @@ -2129,4 +2131,3 @@ def mapping_rename_hook(d): runtime_mapping_rename("RDEPENDS", pkg, d) runtime_mapping_rename("RRECOMMENDS", pkg, d) runtime_mapping_rename("RSUGGESTS", pkg, d) - |