[oe-commits] [openembedded-core] 06/07: package.bbclass: Make staticlib problems non-fatal

[git at git.openembedded.org]

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

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

commit e2235b7567a9aba474cda4cdc20cc9bfffc63711
Author: Ola x Nilsson <ola.x.nilsson at axis.com>
AuthorDate: Mon Apr 23 09:49:49 2018 +0200

    package.bbclass: Make staticlib problems non-fatal
    
    Allow debugsource listing using dwarfsourcefiles to fail for static
    libraries when the archive content is not as expected.
    
    Signed-off-by: Ola x Nilsson <olani at axis.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/package.bbclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e03d450..edeffa9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -344,12 +344,15 @@ def parse_debugsources_from_dwarfsrcfiles_output(dwarfsrcfiles_output):
 
     return debugfiles.keys()
 
-def append_source_info(file, sourcefile, d):
+def append_source_info(file, sourcefile, d, fatal=True):
     cmd = "'dwarfsrcfiles' '%s'" % (file)
     (retval, output) = oe.utils.getstatusoutput(cmd)
     # 255 means a specific file wasn't fully parsed to get the debug file list, which is not a fatal failure
     if retval != 0 and retval != 255:
-        bb.fatal("dwarfsrcfiles failed with exit code %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else ""))
+        msg = "dwarfsrcfiles failed with exit code %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else "")
+        if fatal:
+            bb.fatal(msg)
+        bb.note(msg)
 
     debugsources = parse_debugsources_from_dwarfsrcfiles_output(output)
     # filenames are null-separated - this is an artefact of the previous use
@@ -1052,7 +1055,7 @@ python split_and_strip_files () {
 
         if debugsrcdir and not targetos.startswith("mingw"):
             for file in staticlibs:
-                append_source_info(file, sourcefile, d)
+                append_source_info(file, sourcefile, d, fatal=False)
 
         # Hardlink our debug symbols to the other hardlink copies
         for ref in inodes:

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