mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "package.bbclass: Add '-b' option to file call in isELF"

Browse Source 
This reverts commit 46ddc11a8be79515b4ab9f9f7568c3d624ac72fe.

The change is good in master but became subtly broken during the
backport to rocko. Either the path passed to file should be quoted
using double quotes (with any " chars in the path being escaped) or
the path should be quoted using single quotes (and then any " chars
in the path should NOT be escaped). Escaping " chars and using single
quotes will cause problems for filenames containing " chars.

(From OE-Core rev: 534a4e6775e5b4030619b20ae1f6a319adadccf5)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2018-05-04 12:31:30 -07:00
committed by Richard Purdie
parent 3befe6d7b7
commit 4fca51f08e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/package.bbclass
View File

@@ -901,7 +901,7 @@ python split_and_strip_files () {
# 16 - kernel module
def isELF(path):
type = 0
ret, result = oe.utils.getstatusoutput("file -b '%s'" % path.replace("\"", "\\\""))
ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
if ret:
msg = "split_and_strip_files: 'file %s' failed" % path

2
meta/lib/oe/package.py
View File

@@ -73,7 +73,7 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, qa_already_stripped=
def is_elf(path):
exec_type = 0
ret, result = oe.utils.getstatusoutput(
"file -b \"%s\"" % path.replace("\"", "\\\""))
"file \"%s\"" % path.replace("\"", "\\\""))
if ret:
bb.error("split_and_strip_files: 'file %s' failed" % path)