aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-04 12:31:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-08 15:37:10 +0100
commit534a4e6775e5b4030619b20ae1f6a319adadccf5 (patch)
tree863891b87a325cde96fc36326ac6e10959007d01 /meta/classes
parent7003a36ef3f686af97798ff6f4bc7b3473f937de (diff)
downloadopenembedded-core-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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 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