aboutsummaryrefslogtreecommitdiff
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-01-15 08:15:52 +0000
commita5f502d78473c8251481806f412e61e67097b7c1 (patch)
treeb78371e1fab1cc4cec4a9368266bfb2630229ea8
parentac0bbf6e6ae6c786c79a84becb9ecb2672c647f0 (diff)
downloadopenembedded-core-contrib-jansa/rocko.zip
openembedded-core-contrib-jansa/rocko.tar.gz
openembedded-core-contrib-jansa/rocko.tar.bz2
sstate.bbclass: Do not cause build failures due to setscene errorsjansa/rocko
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 e30fbe1..db24534 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -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)