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>2020-09-11 13:57:07 +0200
commitc3b83e366a5791c983624e0f82745336b82a98eb (patch)
tree7908991fd54ab2dd82341fbc607df5a1f539875d
parent65013d505eb7308e95132067bb52dd89f4824927 (diff)
downloadopenembedded-core-contrib-c3b83e366a5791c983624e0f82745336b82a98eb.tar.gz
openembedded-core-contrib-c3b83e366a5791c983624e0f82745336b82a98eb.tar.bz2
openembedded-core-contrib-c3b83e366a5791c983624e0f82745336b82a98eb.zip
sstate.bbclass: Do not cause build failures due to setscene errors
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 c0329cd5d1..6603c6e926 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -703,7 +703,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
@@ -712,7 +712,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)