[oe-commits] [openembedded-core] 01/04: Revert "package.bbclass: Add '-b' option to file call in isELF"

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit 534a4e6775e5b4030619b20ae1f6a319adadccf5
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Fri May 4 12:31:30 2018 -0700

    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.
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package.bbclass | 2 +-
 meta/lib/oe/package.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index cee64f3..2053d46 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 -b '%s'" % path.replace("\"", "\\\""))
+        ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
 
         if ret:
             msg = "split_and_strip_files: 'file %s' failed" % path
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 599fca6..1e5c3aa 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -73,7 +73,7 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, qa_already_stripped=
     def is_elf(path):
         exec_type = 0
         ret, result = oe.utils.getstatusoutput(
-            "file -b \"%s\"" % path.replace("\"", "\\\""))
+            "file \"%s\"" % path.replace("\"", "\\\""))
 
         if ret:
             bb.error("split_and_strip_files: 'file %s' failed" % path)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.