From d702d9a926c5f3bc30b14941418f1db74f14468b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 6 Jan 2025 17:54:15 +0000 Subject: sstate: Ensure errors cause task failure (From OE-Core rev: c1491ef7afc8722927c568b0ac0ddbbc84837ca3) Signed-off-by: Richard Purdie --- meta/classes-global/sstate.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes-global/sstate.bbclass') diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index decfb5adef..2c259a6657 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -646,6 +646,7 @@ def sstate_package(ss, d): d.setVar("SSTATE_CURRTASK", ss['task']) bb.utils.remove(sstatebuild, recurse=True) bb.utils.mkdirhier(sstatebuild) + exit = False for state in ss['dirs']: if not os.path.exists(state[1]): continue @@ -664,8 +665,11 @@ def sstate_package(ss, d): if not link.startswith(tmpdir): continue bb.error("sstate found an absolute path symlink %s pointing at %s. Please replace this with a relative link." % (srcpath, link)) + exit = True bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], sstatebuild + state[0])) bb.utils.rename(state[1], sstatebuild + state[0]) + if exit: + bb.fatal("Failing task due to absolute path symlinks") workdir = d.getVar('WORKDIR') sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared") -- cgit v1.2.3-54-g00ecf