aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-08-29 22:36:25 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2018-12-08 22:51:47 +0000
commit61c434d8a65c32611ae00b6a169d12933f4aff5d (patch)
tree8307a6d6f4f3429d8a9955fcee5f57c35cbc1146
parentce9f6ca06557cd24f42293bfb11ad58d521b2fc9 (diff)
downloadopenembedded-core-contrib-jansa/master-submitted.tar.gz
openembedded-core-contrib-jansa/master-submitted.tar.bz2
openembedded-core-contrib-jansa/master-submitted.zip
sstate.bbclass: Do not cause build failures due to setscene errorsjansa/master-submitted
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>
-rw-r--r--meta/classes/sstate.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 8b48ab465f..ba79a0f929 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -678,7 +678,7 @@ def pstaging_fetch(sstatefetch, 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
@@ -687,7 +687,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)