diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-03-23 21:55:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-28 12:09:52 +0100 |
commit | e092acd524013df5c1f73d019208432bbfb8d092 (patch) | |
tree | 6cdad27833b089f4353d2507c32dac8c1e165b20 /meta/classes | |
parent | d1b305e40c0835448ea5f7c44f19474c7856d2a5 (diff) | |
download | poky-e092acd524013df5c1f73d019208432bbfb8d092.tar.gz |
package.bbclass: use single quotes for path passed to file in isELF()
Apparently there are recipes in the wild which generate files with
filenames containing '$' characters - which cause errors during
packaging.
Instead of adding another special case to escape '$' characters when
constructing the command passed to oe.utils.getstatusoutput(), switch
to using single quotes to quote the path - and therefore make isELF()
consistent with the way filenames and paths are quoted by every other
caller of oe.utils.getstatusoutput() in oe-core.
(From OE-Core rev: 7877761534b0c2492da6289e9f2269d41b6ed464)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 83f53a49ef..504c0232ef 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -918,7 +918,7 @@ python split_and_strip_files () { | |||
918 | # 16 - kernel module | 918 | # 16 - kernel module |
919 | def isELF(path): | 919 | def isELF(path): |
920 | type = 0 | 920 | type = 0 |
921 | ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\"")) | 921 | ret, result = oe.utils.getstatusoutput("file '%s'" % path) |
922 | 922 | ||
923 | if ret: | 923 | if ret: |
924 | msg = "split_and_strip_files: 'file %s' failed" % path | 924 | msg = "split_and_strip_files: 'file %s' failed" % path |