]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
sstate.bbclass: Do not cause build failures due to setscene errors jansa/rocko
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Tue, 29 Aug 2017 20:36:25 +0000 (22:36 +0200)
committerMartin Jansa <Martin.Jansa@gmail.com>
Sun, 25 Nov 2018 09:08:33 +0000 (09:08 +0000)
If a setscene task fails, the real task will be run instead. However,
in case the failed setscene task happened to log any errors, this will
still cause bitbake to return with an error code, even though
everything actually built ok. To avoid this, modify setscene to only
warn about errors.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
meta/classes/sstate.bbclass

index e30fbe12809797568f502f40cb84465bcbcf3011..db2453473af091f1d9183302a43e6d2960a57366 100644 (file)
@@ -671,7 +671,7 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
         localdata.setVar('SRC_URI', srcuri)
         try:
             fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False)
-            fetcher.download()
+            fetcher.download(only_warn=True)
 
         except bb.fetch2.BBFetchException:
             break
@@ -680,7 +680,8 @@ def sstate_setscene(d):
     shared_state = sstate_state_fromvars(d)
     accelerate = sstate_installpkg(shared_state, d)
     if not accelerate:
-        bb.fatal("No suitable staging package found")
+        bb.warn("No suitable staging package found")
+        sys.exit(1)
 
 python sstate_task_prefunc () {
     shared_state = sstate_state_fromvars(d)