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

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

[Andreas K. Hüttel]

commit:     f1bc9478e0bd010919c476ca0fca9920f17a331a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 10:06:57 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 16:50:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f1bc9478

stagebase: tweak bindist comment emitted into make.conf

'USE' is more idiomatic.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1ebb2245..34e1b6d1 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1151,7 +1151,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
             myusevars = []
             if "bindist" in self.settings["options"]:
                 myf.write(
-                    "\n# NOTE: This stage was built with the bindist Use flag enabled\n")
+                    "\n# NOTE: This stage was built with the bindist USE flag enabled\n")
             if setup or "sticky-config" in self.settings["options"]:
                 myusevars.extend(self.settings["catalyst_use"])
                 log.notice("STICKY-CONFIG is enabled")

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     f1bc9478e0bd010919c476ca0fca9920f17a331a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 10:06:57 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 16:50:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f1bc9478

stagebase: tweak bindist comment emitted into make.conf

'USE' is more idiomatic.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1ebb2245..34e1b6d1 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1151,7 +1151,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
             myusevars = []
             if "bindist" in self.settings["options"]:
                 myf.write(
-                    "\n# NOTE: This stage was built with the bindist Use flag enabled\n")
+                    "\n# NOTE: This stage was built with the bindist USE flag enabled\n")
             if setup or "sticky-config" in self.settings["options"]:
                 myusevars.extend(self.settings["catalyst_use"])
                 log.notice("STICKY-CONFIG is enabled")

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     31e62c9ca151083e0b84bab8f478bb27592c5086
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 16:28:52 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 21:45:23 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=31e62c9c

Explicitly declare repo as main when it does not match the default main

Otherwise Portage complains about PORTDIR not being set.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Closes: https://github.com/gentoo/catalyst/pull/13
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 4bcab30c..1ebb2245 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -921,6 +921,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
                 continue
 
             config = configparser.ConfigParser()
+
+            # If default is present but does not match this repo's location,
+            # then we need to explicitly set it as the main repo.
+            if default is not None:
+                config['DEFAULT'] = {'main-repo': name}
+
             config[name] = {'location': location}
             self.write_repo_conf(name, config)
 

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     cde8a57f8c7b40e66cc6fda6f923bd8b2f21297c
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Tue Jul 30 00:00:40 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 11:05:56 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cde8a57f

stagebase: clean up config_profile_link

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 2dcf6d71..df2da7ef 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -864,18 +864,23 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
     def config_profile_link(self):
         log.info('Configuring profile link...')
-        make_profile = Path(self.settings['chroot_path'] + self.settings['port_conf'],
-                            'make.profile')
+
+        chroot_port_conf = Path(self.settings['chroot_path'] + self.settings['port_conf'])
+        make_profile = chroot_port_conf / 'make.profile'
         make_profile.unlink(missing_ok=True)
+
         try:
             repo_name, target_profile = self.settings['target_profile'].split(":", 1)
         except ValueError:
             repo_name = self.settings['repo_name']
             target_profile = self.settings['target_profile']
-        make_profile.symlink_to(Path('../..' + self.settings['repo_basedir'],
-                                     repo_name,
-                                     'profiles',
-                                     target_profile),
+
+        chroot_profile_path = Path(self.settings['chroot_path'] + self.settings['repo_basedir'],
+                                   repo_name,
+                                   'profiles',
+                                   target_profile)
+
+        make_profile.symlink_to(os.path.relpath(chroot_profile_path, chroot_port_conf),
                                 target_is_directory=True)
 
     def setup_confdir(self):

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     35e6088eda0c2c8197c16382f3ba29a69eea60ec
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Tue Jul 30 01:08:02 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 11:06:05 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=35e6088e

stagebase: create profile link for ROOT too

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index df2da7ef..ad7cd12e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -883,6 +883,17 @@ class StageBase(TargetBase, ClearBase, GenBase):
         make_profile.symlink_to(os.path.relpath(chroot_profile_path, chroot_port_conf),
                                 target_is_directory=True)
 
+        if self.settings['root_path'] != '/':
+            log.info('Configuring ROOT profile link...')
+
+            # stage_path is chroot_path + root_path
+            root_port_conf = Path(self.settings['stage_path'] + self.settings['port_conf'])
+            root_make_profile = root_port_conf / 'make.profile'
+            root_make_profile.unlink(missing_ok=True)
+
+            root_make_profile.symlink_to(os.path.relpath(chroot_profile_path, root_port_conf),
+                                         target_is_directory=True)
+
     def setup_confdir(self):
         if "autoresume" in self.settings["options"] \
                 and self.resume.is_enabled("setup_confdir"):

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     a031478a9c996d8a3a9085ed6eed41d8737776ed
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Tue Jul 30 14:11:07 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 14:11:32 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a031478a

stagebase: Create parent directories

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ad7cd12e..82300e88 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -888,6 +888,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
             # stage_path is chroot_path + root_path
             root_port_conf = Path(self.settings['stage_path'] + self.settings['port_conf'])
+            root_port_conf.mkdir(mode=0o755, parents=True, exist_ok=True)
+
             root_make_profile = root_port_conf / 'make.profile'
             root_make_profile.unlink(missing_ok=True)
 

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     6356b5ab72a658635dd018c25b21ce998250f887
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  3 09:04:30 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug  3 09:04:30 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6356b5ab

Add log.debug statements to follow profile symlink creation

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 82300e88..2975236e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -888,11 +888,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
             # stage_path is chroot_path + root_path
             root_port_conf = Path(self.settings['stage_path'] + self.settings['port_conf'])
+            log.debug('  creating directory %s', root_port_conf)
             root_port_conf.mkdir(mode=0o755, parents=True, exist_ok=True)
 
             root_make_profile = root_port_conf / 'make.profile'
+            log.debug('  removing file %s', root_make_profile)
             root_make_profile.unlink(missing_ok=True)
 
+            log.debug('  symlinking it to %s', os.path.relpath(chroot_profile_path, root_port_conf))
             root_make_profile.symlink_to(os.path.relpath(chroot_profile_path, root_port_conf),
                                          target_is_directory=True)
 

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     836744689e0cc09a1a0a89b7272142d5dfb99bd4
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 18:27:34 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 18:39:53 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=83674468

Add Dist-kernel kconfig support

Based on the orginal patch by oldfashionedcow to add the abilty for
a user to set a custom kconfig for their livecd to be moved to
/etc/kernel/config.d/ before sys-kernel/gentoo-kernel is emerged.

Syntax is the same as the one used for Genkernel kconfigs.

Closes: https://bugs.gentoo.org/936676

Co-authored-by: Rahul Sandh <rahul <AT> sandhuservices.dev>
Co-authored-by: Christopher Fore <csfore <AT> posteo.net>

Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/catalyst/pull/21
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 catalyst/base/stagebase.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a23b1d90..8a3d2af6 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1707,8 +1707,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
                 raise CatalystError("Can't find kernel config: %s" %
                                     self.settings[key])
 
-            shutil.copy(self.settings[key],
-                        self.settings['chroot_path'] + '/var/tmp/' + kname + '.config')
+            if "boot/kernel/" + kname + "/distkernel" in self.settings:
+                os.makedirs(self.settings['chroot_path'] + '/etc//kernel/config.d')
+                shutil.copy(self.settings[key],
+                            self.settings['chroot_path'] + '/etc//kernel/config.d')
+            else:
+                shutil.copy(self.settings[key],
+                            self.settings['chroot_path'] + '/var/tmp/' + kname + '.config')
 
     def _copy_initramfs_overlay(self, kname):
         key = 'boot/kernel/' + kname + '/initramfs_overlay'

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     733333900b4cbd5c2ba0ac7e60a5e603acab759d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  5 21:48:06 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct  5 21:48:06 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=73333390

Add create_qcow2 action

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6fe462cc..61669342 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1628,6 +1628,25 @@ class StageBase(TargetBase, ClearBase, GenBase):
             log.warning('livecd/iso was not defined.  '
                         'An ISO Image will not be created.')
 
+    def create_qcow2(self):
+        if "autoresume" in self.settings["options"] \
+                and self.resume.is_enabled("create_qcow2"):
+            log.notice(
+                'Resume point detected, skipping create_qcow2 operation...')
+            return
+
+        # Create the QCOW2 file
+        if "qcow2" in self.settings:
+            cmd([self.settings['controller_file'], 'qcow2', self.settings['qcow2']],
+                env=self.env)
+            # FIXME: implement this
+            # self.gen_contents_file(self.settings["qcow2"])
+            self.gen_digest_file(self.settings["qcow2"])
+            self.resume.enable("create_qcow2")
+        else:
+            log.warning('diskimage/qcow2 was not defined.  '
+                        'A QCOW2 file will not be created.')
+
     def build_packages(self):
         build_packages_resume = pjoin(self.settings["autoresume_path"],
                                       "build_packages")

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     3a75f67df560e02b4e709cf624bc0419bc440d51
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  6 21:48:33 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct  6 21:48:33 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3a75f67d

Fix settings parameter name

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 61669342..1295851d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1636,7 +1636,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
             return
 
         # Create the QCOW2 file
-        if "qcow2" in self.settings:
+        if "diskimage/qcow2" in self.settings:
             cmd([self.settings['controller_file'], 'qcow2', self.settings['qcow2']],
                 env=self.env)
             # FIXME: implement this

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     0e4e67f21d21db25290a659b1b050676507cde77
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  6 21:52:16 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct  6 21:52:16 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0e4e67f2

Dito

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1295851d..55ab6cb7 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1637,11 +1637,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
         # Create the QCOW2 file
         if "diskimage/qcow2" in self.settings:
-            cmd([self.settings['controller_file'], 'qcow2', self.settings['qcow2']],
+            cmd([self.settings['controller_file'], 'qcow2', self.settings['diskimage/qcow2']],
                 env=self.env)
             # FIXME: implement this
             # self.gen_contents_file(self.settings["qcow2"])
-            self.gen_digest_file(self.settings["qcow2"])
+            self.gen_digest_file(self.settings["diskimage/qcow2"])
             self.resume.enable("create_qcow2")
         else:
             log.warning('diskimage/qcow2 was not defined.  '

[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/base/

[Andreas K. Hüttel]

commit:     bcd1b80382ff39cb9415dba63980e58d25f00d62
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 14:29:02 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 14:29:02 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bcd1b803

A / went astray

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ac950354..b26c22ac 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -437,7 +437,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
             del self.settings[self.settings["spec_prefix"] + "/iso"]
 
     def set_qcow2(self):
-        if self.settings["spec_prefix"] + "qcow2" in self.settings:
+        if self.settings["spec_prefix"] + "/qcow2" in self.settings:
             if self.settings[self.settings["spec_prefix"] + "/qcow2"].startswith('/'):
                 self.settings["qcow2"] = \
                     normpath(