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 B407713835A for ; Sat, 19 Dec 2020 19:56:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9155FE099C; Sat, 19 Dec 2020 19:56:04 +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 5C7CFE099C for ; Sat, 19 Dec 2020 19:56:04 +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 0E1A7340E1F for ; Sat, 19 Dec 2020 19:56:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B29D5D0 for ; Sat, 19 Dec 2020 19:56:01 +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: <1604097652.3d85d537b1a00d05234cea064f863602b83ffaab.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/embedded.py catalyst/targets/livecd_stage1.py catalyst/targets/livecd_stage2.py catalyst/targets/netboot.py catalyst/targets/stage1.py catalyst/targets/stage4.py X-VCS-Directories: catalyst/base/ catalyst/targets/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3d85d537b1a00d05234cea064f863602b83ffaab X-VCS-Branch: wip/mattst88 Date: Sat, 19 Dec 2020 19:56:01 +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: 111f44de-8b78-4d04-9e64-6006383066bb X-Archives-Hash: f60529ea6a2019c9f40e16cf826b2b2c commit: 3d85d537b1a00d05234cea064f863602b83ffaab Author: Matt Turner gentoo org> AuthorDate: Thu Oct 29 03:08:04 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Oct 30 22:40:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3d85d537 catalyst: Split action_sequence into prepare/build/finish 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 gentoo.org> 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", 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 5D06013835A for ; Fri, 30 Oct 2020 22:41:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99523E0831; Fri, 30 Oct 2020 22:41:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 755DDE083D for ; Fri, 30 Oct 2020 22:41:10 +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 7A5F133FEDE for ; Fri, 30 Oct 2020 22:41:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9932742A for ; Fri, 30 Oct 2020 22:41:06 +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: <1604097652.3d85d537b1a00d05234cea064f863602b83ffaab.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/embedded.py catalyst/targets/livecd_stage1.py catalyst/targets/livecd_stage2.py catalyst/targets/netboot.py catalyst/targets/stage1.py catalyst/targets/stage4.py X-VCS-Directories: catalyst/targets/ catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3d85d537b1a00d05234cea064f863602b83ffaab X-VCS-Branch: master Date: Fri, 30 Oct 2020 22:41:06 +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: d3990cb1-3a64-4792-ac87-2676762030c6 X-Archives-Hash: 89d40e52385768c15b6848d002ae6306 Message-ID: <20201030224106.BWt39cUG2phigFhHvyYKNt9KkP00b1AvzY2By_9p158@z> commit: 3d85d537b1a00d05234cea064f863602b83ffaab Author: Matt Turner gentoo org> AuthorDate: Thu Oct 29 03:08:04 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Oct 30 22:40:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3d85d537 catalyst: Split action_sequence into prepare/build/finish 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 gentoo.org> 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",