]> code.ossystems Code Review - openembedded-core.git/commitdiff
package.bbclass: use single quotes for path passed to file in isELF()
authorAndre McCurdy <armccurdy@gmail.com>
Fri, 4 May 2018 19:31:31 +0000 (12:31 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 8 May 2018 14:37:10 +0000 (15:37 +0100)
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>
meta/classes/package.bbclass

index 2053d46395a7fe4be34c72d1853dfc21c503a380..e68299e10c580fc276ae1c44520db7c0d57320c9 100644 (file)
@@ -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