]> 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>
Thu, 3 May 2018 08:52:11 +0000 (09:52 +0100)
commit46ddc11a8be79515b4ab9f9f7568c3d624ac72fe
tree9838ce627c458418a91484565db9e4ba51738d87
parent413c54e0698589b17976e88fa7ab76e5dbac51aa
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@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[fixup for Rocko]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/classes/package.bbclass
meta/lib/oe/package.py