diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2012-07-31 04:00:01 +0200 |
|---|---|---|
| committer |   Scott Garman <scott.a.garman@intel.com> | 2012-09-24 09:51:09 -0700 |
| commit | 12e40ca7317289fec126d9f30b28a717fe72d274 (patch) | |
| tree | c8711ccac9de798b6244967a03cdd5846a4d5e9e | |
| parent | f60a04ccbf9ed614b5b5b9b02c8a24980bf17d3d (diff) | |
| download | openembedded-core-12e40ca7317289fec126d9f30b28a717fe72d274.tar.gz | |
package.bbclass: fix TypeError in runstrip
* some packages have .ko files which are not elf, without this change
it fails with TypeError, with this change only runstip fails and
reports where:
ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package.bbclass | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 44e551f6dd..c03e5be028 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -298,12 +298,16 @@ def runstrip(file, elftype, d): os.chmod(file, newmode) extraflags = "" - # .so and shared library - if ".so" in file and elftype & 8: - extraflags = "--remove-section=.comment --remove-section=.note --strip-unneeded" - # shared or executable: - elif elftype & 8 or elftype & 4: - extraflags = "--remove-section=.comment --remove-section=.note" + + # split_and_strip_files is calling this with elf_type None, causing: + # TypeError: unsupported operand type(s) for &: 'NoneType' and 'int' + if elftype: + # .so and shared library + if ".so" in file and elftype & 8: + extraflags = "--remove-section=.comment --remove-section=.note --strip-unneeded" + # shared or executable: + elif elftype & 8 or elftype & 4: + extraflags = "--remove-section=.comment --remove-section=.note" stripcmd = "'%s' %s '%s'" % (strip, extraflags, file) bb.debug(1, "runstrip: %s" % stripcmd) |