summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-06-13 22:09:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:11:10 +0100
commit70d63061f38795e05a1a78d40ed56d73236d4344 (patch)
treea10c94e72e5cac24f59c1325fea3d8b6f8c83142 /meta/classes/package.bbclass
parente2e6fe964defb0ac0d2850a0ddae0885c409981f (diff)
downloadpoky-70d63061f38795e05a1a78d40ed56d73236d4344.tar.gz
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. (From OE-Core rev: d3059e5d35dcb01641e828c5182615b8fbf1f2e5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass7
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 () {
841 dvar = d.getVar('PKGD', True) 841 dvar = d.getVar('PKGD', True)
842 pn = d.getVar('PN', True) 842 pn = d.getVar('PN', True)
843 843
844 oldcwd = os.getcwd()
845 os.chdir(dvar)
846
844 # We default to '.debug' style 847 # We default to '.debug' style
845 if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE', True) == 'debug-file-directory': 848 if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE', True) == 'debug-file-directory':
846 # Single debug-file-directory style debug info 849 # Single debug-file-directory style debug info
@@ -864,8 +867,6 @@ python split_and_strip_files () {
864 sourcefile = d.expand("${WORKDIR}/debugsources.list") 867 sourcefile = d.expand("${WORKDIR}/debugsources.list")
865 bb.utils.remove(sourcefile) 868 bb.utils.remove(sourcefile)
866 869
867 os.chdir(dvar)
868
869 # Return type (bits): 870 # Return type (bits):
870 # 0 - not elf 871 # 0 - not elf
871 # 1 - ELF 872 # 1 - ELF
@@ -1052,6 +1053,7 @@ python split_and_strip_files () {
1052 # 1053 #
1053 # End of strip 1054 # End of strip
1054 # 1055 #
1056 os.chdir(oldcwd)
1055} 1057}
1056 1058
1057python populate_packages () { 1059python populate_packages () {
@@ -2129,4 +2131,3 @@ def mapping_rename_hook(d):
2129 runtime_mapping_rename("RDEPENDS", pkg, d) 2131 runtime_mapping_rename("RDEPENDS", pkg, d)
2130 runtime_mapping_rename("RRECOMMENDS", pkg, d) 2132 runtime_mapping_rename("RRECOMMENDS", pkg, d)
2131 runtime_mapping_rename("RSUGGESTS", pkg, d) 2133 runtime_mapping_rename("RSUGGESTS", pkg, d)
2132