diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2018-05-04 12:31:30 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-08 15:37:10 +0100 |
| commit | 534a4e6775e5b4030619b20ae1f6a319adadccf5 (patch) | |
| tree | 863891b87a325cde96fc36326ac6e10959007d01 | |
| parent | 7003a36ef3f686af97798ff6f4bc7b3473f937de (diff) | |
| download | openembedded-core-contrib-534a4e6775e5b4030619b20ae1f6a319adadccf5.tar.gz | |
Revert "package.bbclass: Add '-b' option to file call in isELF"
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.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oe/package.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index cee64f3267..2053d46395 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -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 diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 599fca60f8..1e5c3aa8e1 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -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) |