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:10 +0100 |
commit | 080f0ee910684beb8bc263d5a45d3aa39b6ee647 (patch) | |
tree | 2fb82845f520c5cfd64ef237a4b85d949aa0e4fd /meta/classes | |
parent | 534a4e6775e5b4030619b20ae1f6a319adadccf5 (diff) | |
download | openembedded-core-080f0ee910684beb8bc263d5a45d3aa39b6ee647.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.
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 () { # 16 - kernel module def isELF(path): type = 0 - ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\"")) + ret, result = oe.utils.getstatusoutput("file '%s'" % path) if ret: msg = "split_and_strip_files: 'file %s' failed" % path |