From 1ae0e69aed235d8abda634328cd44323a5b10608 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Feb 2023 13:34:59 +0000 Subject: sstate: Add check_for_interrupts() call functionality added in bitbake Add in the new 'check' calls which mean that the code can exit from longer running code loops if requested by the user. This covers sstate checks and sstate manifest cleanup code which currently couldn't be interrupted by the user from the UI. Increase the minimum bitbake version which brings in this API. (From OE-Core rev: cb6c50689175668b66ffbe09ff8f250ba9a9034b) Signed-off-by: Richard Purdie --- meta/classes-global/sstate.bbclass | 3 +++ meta/conf/sanity.conf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 567de4aba4..5b63582b5a 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -1023,6 +1023,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, if progress: bb.event.fire(bb.event.ProcessProgress(msg, next(cnt_tasks_done)), d) + bb.event.check_for_interrupts(d) tasklist = [] for tid in missed: @@ -1296,6 +1297,7 @@ python sstate_eventhandler_reachablestamps() { lines.remove(r) removed = removed + 1 bb.event.fire(bb.event.ProcessProgress(msg, removed), d) + bb.event.check_for_interrupts(d) bb.event.fire(bb.event.ProcessFinished(msg), d) @@ -1365,6 +1367,7 @@ python sstate_eventhandler_stalesstate() { bb.utils.remove(stamp) removed = removed + 1 bb.event.fire(bb.event.ProcessProgress(msg, removed), d) + bb.event.check_for_interrupts(d) bb.event.fire(bb.event.ProcessFinished(msg), d) } diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index fff1ad8246..593419921f 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "2.0.1" +BB_MIN_VERSION = "2.3.1" SANITY_ABIFILE = "${TMPDIR}/abi_version" -- cgit v1.2.3-54-g00ecf