1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00

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>
This commit is contained in:
Ross Burton
2016-06-13 22:09:54 +01:00
committed by Richard Purdie
parent e2e6fe964d
commit 70d63061f3
+4 -3
View File
@@ -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)