From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0408A138350 for ; Fri, 10 Apr 2020 02:11:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30EF2E089B; Fri, 10 Apr 2020 02:11:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CB9EE089B for ; Fri, 10 Apr 2020 02:11:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA1B534EF6C for ; Fri, 10 Apr 2020 02:11:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 711321CF for ; Fri, 10 Apr 2020 02:11:28 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586460223.c3b572d0ed5ebf29017da5e894e98fe9ab150126.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c3b572d0ed5ebf29017da5e894e98fe9ab150126 X-VCS-Branch: master Date: Fri, 10 Apr 2020 02:11:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7bd7704-aa1f-43bd-b48d-70f76cf73506 X-Archives-Hash: f66204c4810f446ac5458dc743a9cc47 commit: c3b572d0ed5ebf29017da5e894e98fe9ab150126 Author: Matt Turner gentoo org> AuthorDate: Thu Apr 9 19:04:28 2020 +0000 Commit: Matt Turner gentoo 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 /verify is set Signed-off-by: Matt Turner 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 /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.')