mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
package_manager: remove strings and migrate to direct arrays
When using subprocess call and check_output, it is better to use arrays rather than strings when possible to avoid whitespace and quoting problems. [ YOCTO #9342 ] (From OE-Core rev: b12cec9a5ef14ecb02be7feec65508cf5d65c795) Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
56b4aa820c
commit
d8fbaebc48
@@ -18,23 +18,24 @@ def runstrip(arg):
|
||||
newmode = origmode | stat.S_IWRITE | stat.S_IREAD
|
||||
os.chmod(file, newmode)
|
||||
|
||||
extraflags = ""
|
||||
stripcmd = [strip]
|
||||
|
||||
# kernel module
|
||||
if elftype & 16:
|
||||
extraflags = "--strip-debug --remove-section=.comment --remove-section=.note --preserve-dates"
|
||||
stripcmd.extend(["--strip-debug", "--remove-section=.comment",
|
||||
"--remove-section=.note", "--preserve-dates"])
|
||||
# .so and shared library
|
||||
elif ".so" in file and elftype & 8:
|
||||
extraflags = "--remove-section=.comment --remove-section=.note --strip-unneeded"
|
||||
stripcmd.extend(["--remove-section=.comment", "--remove-section=.note", "--strip-unneeded"])
|
||||
# shared or executable:
|
||||
elif elftype & 8 or elftype & 4:
|
||||
extraflags = "--remove-section=.comment --remove-section=.note"
|
||||
stripcmd.extend(["--remove-section=.comment", "--remove-section=.note"])
|
||||
|
||||
stripcmd = "'%s' %s '%s'" % (strip, extraflags, file)
|
||||
stripcmd.append(file)
|
||||
bb.debug(1, "runstrip: %s" % stripcmd)
|
||||
|
||||
try:
|
||||
output = subprocess.check_output(stripcmd, stderr=subprocess.STDOUT, shell=True)
|
||||
output = subprocess.check_output(stripcmd, stderr=subprocess.STDOUT)
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.error("runstrip: '%s' strip command failed with %s (%s)" % (stripcmd, e.returncode, e.output))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user