]> code.ossystems Code Review - openembedded-core.git/commit
package.bbclass: Add '-b' option to file call in isELF
authorMark Hatle <mark.hatle@windriver.com>
Mon, 16 Apr 2018 15:34:18 +0000 (11:34 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 18 Apr 2018 17:48:20 +0000 (18:48 +0100)
commit5a324e9b2cf6378f8eaa4e394f9cb36d4e2680ac
treec4320546eda0e28bc30e8c86b32df5b073cbcbd7
parentb1600ec8991dfbd3b73d209b9c620a171c5b13c4
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

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/package.bbclass
meta/lib/oe/package.py