summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
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:17 +0100
commit4fca51f08e5aa7c726633eb0210377591c7f60ba (patch)
treece86153ff3082a47f73b70f74c3125d8e814c00d /meta/classes/package.bbclass
parent3befe6d7b7fa8c8481519aa8dd0cae52207ad339 (diff)
downloadpoky-4fca51f08e5aa7c726633eb0210377591c7f60ba.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. (From OE-Core rev: 534a4e6775e5b4030619b20ae1f6a319adadccf5) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-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 () {
901 # 16 - kernel module 901 # 16 - kernel module
902 def isELF(path): 902 def isELF(path):
903 type = 0 903 type = 0
904 ret, result = oe.utils.getstatusoutput("file -b '%s'" % path.replace("\"", "\\\"")) 904 ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
905 905
906 if ret: 906 if ret:
907 msg = "split_and_strip_files: 'file %s' failed" % path 907 msg = "split_and_strip_files: 'file %s' failed" % path