[oe-commits] [openembedded-core] 27/35: 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 46ddc11a8be79515b4ab9f9f7568c3d624ac72fe
Author: Mark Hatle <mark.hatle at windriver.com>
AuthorDate: Mon Apr 16 11:34:18 2018 -0400

    package.bbclass: Add '-b' option to file call in isELF
    
    The isELF function works by running:
    
       result = file <pathname>
       if 'ELF' in result
    
    By default 'file' will prepend the result with the path name of the file
    that is being checked.  This usually works fine, such as:
    
    $ file /home/foo/openembedded-core/meta/classes/package.bbclass
    /home/foo/openembedded-core/meta/classes/package.bbclass: Python script, ASCII text executable, with very long lines
    
    However, if the path includes 'ELF', ELF will end up in the result, and then
    the check will return positive.
    
    $ file /home/ELF/openembedded-core/meta/classes/package.bbclass
    /home/ELF/openembedded-core/meta/classes/package.bbclass: Python script, ASCII text executable, with very long lines
    
    This will then result in the isELF coming back true, and possibly causing the
    checks that use isELF, such as the 'is it already stripped' check, to do the
    incorrect thing.
    
    Adding the '-b' option to file will result in the path being omitted in the
    result:
    
    $ file /home/ELF/openembedded-core/meta/classes/package.bbclass
    Python script, ASCII text executable, with very long lines
    
    (From OE-Core rev: 5a324e9b2cf6378f8eaa4e394f9cb36d4e2680ac)
    
    Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    [fixup for Rocko]
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 2053d46..cee64f3 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 -b '%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 1e5c3aa..599fca6 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 \"%s\"" % path.replace("\"", "\\\""))
+            "file -b \"%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.