commit: c3b572d0ed5ebf29017da5e894e98fe9ab150126 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Apr 9 19:04:28 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Apr 9 19:23:43 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c3b572d0
catalyst: Automatically specify --b2sum if <target>/verify is set Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/base/stagebase.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 4855c9f0..00596264 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -672,10 +672,18 @@ class StageBase(TargetBase, ClearBase, GenBase): [addlargs["boot/kernel/" + x + "/packages"]] def set_build_kernel_vars(self): - if self.settings["spec_prefix"] + "/gk_mainargs" in self.settings: - self.settings["gk_mainargs"] = \ - self.settings[self.settings["spec_prefix"] + "/gk_mainargs"] - del self.settings[self.settings["spec_prefix"] + "/gk_mainargs"] + prefix = self.settings["spec_prefix"] + + gk_mainargs = prefix + "/gk_mainargs" + if gk_mainargs in self.settings: + self.settings["gk_mainargs"] = self.settings[gk_mainargs] + del self.settings[gk_mainargs] + + # Ask genkernel to include b2sum if <target>/verify is set + verify = prefix + "/verify" + if verify in self.settings: + assert self.settings[verify] == "blake2" + self.settings.setdefault("gk_mainargs", "").append(" --b2sum") def kill_chroot_pids(self): log.info('Checking for processes running in chroot and killing them.')