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-06-21 18:27:08 +0000
commit7c205329cbd33a76dcdfc377b067658cb5edfd9f (patch)
tree6e72c7d21ff740aa490c53a8ed780d99512de090
parentf07b44f067a19794279a2bc66f480deb29fe744b (diff)
downloadopenembedded-core-contrib-jansa/master-submitted.zip
openembedded-core-contrib-jansa/master-submitted.tar.gz
openembedded-core-contrib-jansa/master-submitted.tar.bz2
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 1a95f8f..a5f7a73 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -670,7 +670,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
@@ -679,7 +679,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)