From d3059e5d35dcb01641e828c5182615b8fbf1f2e5 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 13 Jun 2016 22:09:54 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta') 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) - -- cgit v1.2.3