]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
sstate.bbclass: Do not cause build failures due to setscene errors
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Tue, 29 Aug 2017 20:36:25 +0000 (22:36 +0200)
committerMartin Jansa <Martin.Jansa@gmail.com>
Thu, 25 Apr 2019 17:40:16 +0000 (17:40 +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 0b2885014071f7793fa895ad8c3199bef1ce7144..ef58f2f9b0d72baf49e8df8e442f42eae85e3f67 100644 (file)
@@ -675,7 +675,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
@@ -684,7 +684,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)