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 6FA73138359 for ; Thu, 29 Oct 2020 16:16:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8E47E09A5; Thu, 29 Oct 2020 16:16:47 +0000 (UTC) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (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 AEB7CE09A5 for ; Thu, 29 Oct 2020 16:16:47 +0000 (UTC) Received: by mail-qk1-f182.google.com with SMTP id i21so1661572qka.12 for ; Thu, 29 Oct 2020 09:16:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=St3MgAidoaspkOFibMjCJyXUKLgNba3Jyh4b1t/h3ec=; b=r4ZaV6SPuRHpNT52TiPwYYpf4Glyu1gxskymPLuqnLiJUKeBBht6iYX4gOwtJaXsIz jeE8SuqufNcecbK1jghZZxdF5NTLg00jS8BOsax9xVmzqoac/fFk8/F20SSqE3ZMIVrF 2S5Z+TYSESZ6ykbEA8r++1dev2Rm11pDcxwLhZNPI4OR1MQ+7tA4i1UqKy/KlL4ikNB6 MDNjkmyGG9MYriHImaU4zhEMy4MLmaoHULMad79ykt4wOez9cnk7bx4YfTNBVjb1m7IS 0vgy/d0PKDfpxUPPl/rD89H7iYd3Hy9mGQtyXoGv8fgZiunCZ+Myw3xVeU+0TrJpmHcj /J0A== X-Gm-Message-State: AOAM530ue2EuRVxQrUgATNgzl1R+mGZ4rsOcsIR06pap9Yj4Nhn5PLys /5xWqaNEUhZO9/fXOpPq9yeVcQs35oM= X-Google-Smtp-Source: ABdhPJzyXAseXeMOojWnY9JOpt3V2AGxc4ekTFozquEV1+LTvk9E1F+nM1JqMczCZHPCKxbC3UlLag== X-Received: by 2002:a05:620a:95b:: with SMTP id w27mr4399543qkw.339.1603988206588; Thu, 29 Oct 2020 09:16:46 -0700 (PDT) Received: from localhost (2606-a000-131c-10bb-0000-0000-0000-1fc3.inf6.spectrum.com. [2606:a000:131c:10bb::1fc3]) by smtp.gmail.com with ESMTPSA id n206sm1315466qke.72.2020.10.29.09.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 09:16:45 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 06/12] catalyst: Split action_sequence into prepare/build/finish Date: Thu, 29 Oct 2020 12:16:26 -0400 Message-Id: <20201029161632.146732-6-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201029161632.146732-1-mattst88@gentoo.org> References: <20201029161632.146732-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 92a38390-9457-464a-be15-5779a877ed7f X-Archives-Hash: 25a5af8a16f48b17260ebefcf5b2a1c2 We want to run the "build" sequence in a different mount namespace from the "prepare" and "finish" sequences, so this splits action_sequence into those groupings. Signed-off-by: Matt Turner --- catalyst/base/stagebase.py | 24 +++++++++++++++--------- catalyst/targets/embedded.py | 6 +++++- catalyst/targets/livecd_stage1.py | 6 +++++- catalyst/targets/livecd_stage2.py | 10 +++++++--- catalyst/targets/netboot.py | 6 +++++- catalyst/targets/stage1.py | 12 ++++++------ catalyst/targets/stage4.py | 6 +++++- 7 files changed, 48 insertions(+), 22 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 46b7c59c..75c84baa 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -64,7 +64,9 @@ class StageBase(TargetBase, ClearBase, GenBase): "portage_overlay", "portage_prefix", ]) - self.action_sequence = [] + self.prepare_sequence = [] + self.build_sequence = [] + self.finish_sequence = [] self.set_valid_build_kernel_vars(addlargs) TargetBase.__init__(self, myspec, addlargs) @@ -478,36 +480,40 @@ class StageBase(TargetBase, ClearBase, GenBase): Or it calls the normal set_action_sequence() for the target stage. """ if "purgeonly" in self.settings["options"]: - self.action_sequence.append("remove_chroot") + self.build_sequence.append("remove_chroot") return self.set_action_sequence() def set_action_sequence(self): """Set basic stage1, 2, 3 action sequences""" - self.action_sequence.extend([ + self.prepare_sequence.extend([ "unpack", "setup_confdir", "portage_overlay", + ]) + self.build_sequence.extend([ "bind", "chroot_setup", "setup_environment", "run_local", "preclean", "unbind", + ]) + self.finish_sequence.extend([ "clean", ]) self.set_completion_action_sequences() def set_completion_action_sequences(self): if "fetch" not in self.settings["options"]: - self.action_sequence.append("capture") + self.finish_sequence.append("capture") if "keepwork" in self.settings["options"]: - self.action_sequence.append("clear_autoresume") + self.finish_sequence.append("clear_autoresume") elif "seedcache" in self.settings["options"]: - self.action_sequence.append("remove_autoresume") + self.finish_sequence.append("remove_autoresume") else: - self.action_sequence.append("remove_autoresume") - self.action_sequence.append("remove_chroot") + self.finish_sequence.append("remove_autoresume") + self.finish_sequence.append("remove_chroot") def set_use(self): use = self.settings["spec_prefix"] + "/use" @@ -1381,7 +1387,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.purge() failure = False - for x in self.action_sequence: + for x in self.prepare_sequence + self.build_sequence + self.finish_sequence: log.notice('--- Running action sequence: %s', x) sys.stdout.flush() try: diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index 75eb68e4..1314ce7c 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -41,11 +41,13 @@ class embedded(StageBase): StageBase.__init__(self, spec, addlargs) def set_action_sequence(self): - self.action_sequence.extend([ + self.prepare_sequence.extend([ "unpack", "config_profile_link", "setup_confdir", "portage_overlay", + ]) + self.build_sequence.extend([ "bind", "chroot_setup", "setup_environment", @@ -55,6 +57,8 @@ class embedded(StageBase): "fsscript", "unmerge", "unbind", + ]) + self.finish_sequence.extend([ "remove", "empty", "clean", diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py index 9dbfa506..81367053 100644 --- a/catalyst/targets/livecd_stage1.py +++ b/catalyst/targets/livecd_stage1.py @@ -23,16 +23,20 @@ class livecd_stage1(StageBase): StageBase.__init__(self, spec, addlargs) def set_action_sequence(self): - self.action_sequence.extend([ + self.prepare_sequence.extend([ "unpack", "config_profile_link", "setup_confdir", "portage_overlay", + ]) + self.build_sequence.extend([ "bind", "chroot_setup", "setup_environment", "build_packages", "unbind", + ]) + self.finish_sequence.extend([ "clean", ]) self.set_completion_action_sequences() diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index c9b5ce08..f6c14919 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -87,11 +87,13 @@ class livecd_stage2(StageBase): print_traceback=True) def set_action_sequence(self): - self.action_sequence.extend([ + self.prepare_sequence.extend([ "unpack", "config_profile_link", "setup_confdir", "portage_overlay", + ]) + self.build_sequence.extend([ "bind", "chroot_setup", "setup_environment", @@ -99,7 +101,7 @@ class livecd_stage2(StageBase): "build_kernel" ]) if "fetch" not in self.settings["options"]: - self.action_sequence.extend([ + self.build_sequence.extend([ "bootloader", "preclean", "livecd_update", @@ -108,6 +110,8 @@ class livecd_stage2(StageBase): "rcupdate", "unmerge", "unbind", + ]) + self.finish_sequence.extend([ "remove", "empty", "clean", @@ -115,4 +119,4 @@ class livecd_stage2(StageBase): "setup_overlay", "create_iso", ]) - self.action_sequence.append("clear_autoresume") + self.finish_sequence.append("clear_autoresume") diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py index e5c6d43c..9a0a4156 100644 --- a/catalyst/targets/netboot.py +++ b/catalyst/targets/netboot.py @@ -160,11 +160,13 @@ class netboot(StageBase): self.resume.enable("empty") def set_action_sequence(self): - self.action_sequence.extend([ + self.prepare_sequence.extend([ "unpack", "config_profile_link", "setup_confdir", "portage_overlay", + ]) + self.build_sequence.extend([ "bind", "chroot_setup", "setup_environment", @@ -177,6 +179,8 @@ class netboot(StageBase): "remove", "empty", "unbind", + ]) + self.finish_sequence.extend([ "clean", "clear_autoresume", ]) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index 89b30fe1..be3eae93 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -87,15 +87,15 @@ class stage1(StageBase): chroot for re-use in stage2 without the need to unpack it. ''' if "fetch" not in self.settings["options"]: - self.action_sequence.append("capture") + self.finish_sequence.append("capture") if "keepwork" in self.settings["options"]: - self.action_sequence.append("clear_autoresume") + self.finish_sequence.append("clear_autoresume") elif "seedcache" in self.settings["options"]: - self.action_sequence.append("remove_autoresume") - self.action_sequence.append("clean_stage1") + self.finish_sequence.append("remove_autoresume") + self.finish_sequence.append("clean_stage1") else: - self.action_sequence.append("remove_autoresume") - self.action_sequence.append("remove_chroot") + self.finish_sequence.append("remove_autoresume") + self.finish_sequence.append("remove_chroot") def clean_stage1(self): '''seedcache is enabled, so salvage the /tmp/stage1root, diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py index bb20be79..78a5c780 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -39,11 +39,13 @@ class stage4(StageBase): self.settings["cleanables"].remove('/etc/resolv.conf') def set_action_sequence(self): - self.action_sequence.extend([ + self.prepare_sequence.extend([ "unpack", "config_profile_link", "setup_confdir", "portage_overlay", + ]) + self.build_sequence.extend([ "bind", "chroot_setup", "setup_environment", @@ -56,6 +58,8 @@ class stage4(StageBase): "rcupdate", "unmerge", "unbind", + ]) + self.finish_sequence.extend([ "remove", "empty", "clean", -- 2.26.2