[gentoo-commits] proj/catalyst:master commit in: catalyst/targets/

[gentoo-commits] proj/catalyst:master commit in: catalyst/targets/

[Matt Turner]

commit:     ef304389cf83f6ed8cc3ef1584464140cd58656c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 22:53:44 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 17 22:53:44 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ef304389

catalyst: Remove stdout=, since it conflicts with capture_output

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/snapshot.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b7562f7c..7732312c 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -64,7 +64,6 @@ class snapshot(TargetBase):
                                close_fds=False)
 
             sp = subprocess.run([self.git, '-C', self.gitdir, 'rev-parse', 'stable'],
-                                stdout=subprocess.PIPE,
                                 capture_output=True,
                                 check=True,
                                 encoding='utf-8',

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/

[Matt Turner]

commit:     ef304389cf83f6ed8cc3ef1584464140cd58656c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 22:53:44 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 17 22:53:44 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ef304389

catalyst: Remove stdout=, since it conflicts with capture_output

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/snapshot.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b7562f7c..7732312c 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -64,7 +64,6 @@ class snapshot(TargetBase):
                                close_fds=False)
 
             sp = subprocess.run([self.git, '-C', self.gitdir, 'rev-parse', 'stable'],
-                                stdout=subprocess.PIPE,
                                 capture_output=True,
                                 check=True,
                                 encoding='utf-8',

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/targets/

[Matt Turner]

commit:     ef304389cf83f6ed8cc3ef1584464140cd58656c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 22:53:44 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 17 22:53:44 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ef304389

catalyst: Remove stdout=, since it conflicts with capture_output

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/snapshot.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b7562f7c..7732312c 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -64,7 +64,6 @@ class snapshot(TargetBase):
                                close_fds=False)
 
             sp = subprocess.run([self.git, '-C', self.gitdir, 'rev-parse', 'stable'],
-                                stdout=subprocess.PIPE,
                                 capture_output=True,
                                 check=True,
                                 encoding='utf-8',

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/targets/

[Matt Turner]

commit:     3c50f0f689d5970a4803f3e4b745993c4de180f0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 04:33:22 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 04:33:22 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3c50f0f6

catalyst: Don't delete /usr/share/zoneinfo from stage1

I have no clue why we would want to (or even bother) delete the
timezone data out of stage1. It's been this way since the initial
catalyst 2.0 import.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/stage1.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 93c62877..2c09a41f 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -36,7 +36,8 @@ class stage1(StageBase):
     def set_cleanables(self):
         StageBase.set_cleanables(self)
         self.settings["cleanables"].extend([
-            "/usr/share/zoneinfo", self.settings["port_conf"] + "/package*"])
+            self.settings["port_conf"] + "/package*",
+        ])
 
     # XXX: How do these override_foo() functions differ from the ones in StageBase and why aren't they in stage3_target?
     # XXY: It appears the difference is that these functions are actually doing something and the ones in stagebase don't :-(

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/targets/

[Matt Turner]

commit:     fb9697b053221a408347bbdba1b3dd90845b898e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 04:26:15 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 04:27:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fb9697b0

catalyst: Drop useless stage3 set_cleanables()

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/stage3.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/catalyst/targets/stage3.py b/catalyst/targets/stage3.py
index a8192a01..cfc0dbf9 100644
--- a/catalyst/targets/stage3.py
+++ b/catalyst/targets/stage3.py
@@ -24,6 +24,3 @@ class stage3(StageBase):
                 'Using an overlay for earlier stages could cause build issues.\n'
                 "If you break it, you buy it.  Don't complain to us about it.\n"
                 "Don't say we did not warn you.")
-
-    def set_cleanables(self):
-        StageBase.set_cleanables(self)

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/targets/

[Matt Turner]

commit:     6a4fa88d18afefc4aac328dd5bf60d2a13026f2e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 04:28:48 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 04:29:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6a4fa88d

catalyst: Explicitly keep /etc/resolv.conf in stage4

It was confusing to understand that /etc/resolv.conf was *kept* in
stage4 because its set_cleanables() contained everything except it.

This will simplify things if we want to add more common items to the
cleanables list.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/stage4.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index a9b3c936..346c0845 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -32,7 +32,11 @@ class stage4(StageBase):
         StageBase.__init__(self, spec, addlargs)
 
     def set_cleanables(self):
-        self.settings["cleanables"] = ["/var/tmp/*", "/tmp/*"]
+        StageBase.set_cleanables(self)
+
+        # We want to allow stage4's fsscript to generate a default
+        # /etc/resolv.conf
+        self.settings["cleanables"].remove('/etc/resolv.conf')
 
     def set_action_sequence(self):
         self.settings['action_sequence'] = [

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/targets/

[Matt Turner]

commit:     6ef1d63861248098654bd8f211f929f8c6b6c63b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 01:58:42 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 02:56:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6ef1d638

catalyst: Remove some redundant set_stage_path()s

We only need to override root_path, and stage_path will be configured
properly.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/embedded.py | 5 -----
 catalyst/targets/stage1.py   | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index e9138437..918b36bf 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -65,11 +65,6 @@ class embedded(StageBase):
             "clear_autoresume",
         ])
 
-    def set_stage_path(self):
-        self.settings["stage_path"] = normpath(
-            self.settings["chroot_path"]+"/tmp/mergeroot")
-        log.info('embedded stage path is %s', self.settings['stage_path'])
-
     def set_root_path(self):
         self.settings["root_path"] = normpath("/tmp/mergeroot")
         log.info('embedded root path is %s', self.settings['root_path'])

diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index be3eae93..5aa27bb9 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -23,11 +23,6 @@ class stage1(StageBase):
     def __init__(self, spec, addlargs):
         StageBase.__init__(self, spec, addlargs)
 
-    def set_stage_path(self):
-        self.settings["stage_path"] = normpath(
-            self.settings["chroot_path"]+self.settings["root_path"])
-        log.notice('stage1 stage path is %s', self.settings['stage_path'])
-
     def set_root_path(self):
         # sets the root path, relative to 'chroot_path', of the stage1 root
         self.settings["root_path"] = normpath("/tmp/stage1root")