diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-05-04 12:31:31 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-08 15:37:17 +0100 |
commit | d86e69883cf769a8d0fe99edbf36565b2009d1e0 (patch) | |
tree | e02ba44ce219e229870904e9a3fa3f4fe07ff5c9 /meta/classes | |
parent | 4fca51f08e5aa7c726633eb0210377591c7f60ba (diff) | |
download | poky-d86e69883cf769a8d0fe99edbf36565b2009d1e0.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: 080f0ee910684beb8bc263d5a45d3aa39b6ee647)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 7877761534b0c2492da6289e9f2269d41b6ed464)
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 2053d46395..e68299e10c 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 \"%s\"" % path.replace("\"", "\\\"")) | 904 | ret, result = oe.utils.getstatusoutput("file '%s'" % path) |
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 |