commit: 62e7b3d3d2a05ce983ec0c2ba5ea0c9042095d47
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 16:19:46 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 16:19:46 2025 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=62e7b3d3
Revert "In QCOW2 images, enable binpkg-request-signature by default"
This would add binkpkg-request-signature *before* building the remaining qcow2
packages. As a result, all the files in the catalyst cache fail...
This reverts commit a51df5854c70b475d8aaa3d2ec1353d90e0cc63c.
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
catalyst/targets/diskimage_stage1.py | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/catalyst/targets/diskimage_stage1.py
b/catalyst/targets/diskimage_stage1.py
index 6443c1eb..9cbf81df 100644
--- a/catalyst/targets/diskimage_stage1.py
+++ b/catalyst/targets/diskimage_stage1.py
@@ -56,16 +56,3 @@ class diskimage_stage1(StageBase):
' '.join(self.settings["pkgcache_path"]))
else:
StageBase.set_pkgcache_path(self)
-
- def write_make_conf(self, setup=True):
- StageBase.write_make_conf(self, setup)
-
- # Append to make.conf
- makepath = normpath(self.settings["chroot_path"] +
- self.settings["make_conf"])
- with open(makepath, "a") as myf:
- log.notice("Appending diskimage specifics to stage make.conf %s" %
makepath)
- myf.write(
- '\n'
- '# We really want to use binary packages here and use them
properly.\n'
- 'FEATURES="binpkg-request-signature"\n')