commit: 5c1c64692aa4141ea0df2cbe7b7070ed2cf6b9a7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 21:37:39 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 21:37:39 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5c1c6469
Split diskimage stage1 into console and cloudinit (different packages)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../amd64/{diskimage-stage1.spec => diskimage-stage1-cloudinit.spec} | 2 +-
.../amd64/{diskimage-stage1.spec => diskimage-stage1-console.spec} | 3 +--
releases/specs/amd64/diskimage-stage2-cloudinit.spec | 2 +-
releases/specs/amd64/diskimage-stage2-console.spec | 2 +-
tools/catalyst-auto-amd64.conf | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/releases/specs/amd64/diskimage-stage1.spec
b/releases/specs/amd64/diskimage-stage1-cloudinit.spec
similarity index 96%
copy from releases/specs/amd64/diskimage-stage1.spec
copy to releases/specs/amd64/diskimage-stage1-cloudinit.spec
index 4dd34b47..e1ccb306 100644
--- a/releases/specs/amd64/diskimage-stage1.spec
+++ b/releases/specs/amd64/diskimage-stage1-cloudinit.spec
@@ -1,5 +1,5 @@
subarch: amd64
-version_stamp: @TIMESTAMP@
+version_stamp: cloudinit-@TIMESTAMP@
target: diskimage-stage1
rel_type: 23.0-default
profile: default/linux/amd64/23.0/no-multilib/systemd
diff --git a/releases/specs/amd64/diskimage-stage1.spec
b/releases/specs/amd64/diskimage-stage1-console.spec
similarity index 95%
rename from releases/specs/amd64/diskimage-stage1.spec
rename to releases/specs/amd64/diskimage-stage1-console.spec
index 4dd34b47..343e6e19 100644
--- a/releases/specs/amd64/diskimage-stage1.spec
+++ b/releases/specs/amd64/diskimage-stage1-console.spec
@@ -1,5 +1,5 @@
subarch: amd64
-version_stamp: @TIMESTAMP@
+version_stamp: console-@TIMESTAMP@
target: diskimage-stage1
rel_type: 23.0-default
profile: default/linux/amd64/23.0/no-multilib/systemd
@@ -18,7 +18,6 @@ diskimage/packages:
app-arch/unzip
app-crypt/gnupg
app-editors/nano
- app-emulation/cloud-init
app-misc/screen
app-portage/cpuid2cpuflags
app-portage/gentoolkit
diff --git a/releases/specs/amd64/diskimage-stage2-cloudinit.spec
b/releases/specs/amd64/diskimage-stage2-cloudinit.spec
index 3bcaf8e6..a505996c 100644
--- a/releases/specs/amd64/diskimage-stage2-cloudinit.spec
+++ b/releases/specs/amd64/diskimage-stage2-cloudinit.spec
@@ -4,7 +4,7 @@ target: diskimage-stage2
rel_type: 23.0-default
profile: default/linux/amd64/23.0/no-multilib/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-default/diskimage-stage1-amd64-@TIMESTAMP@
+source_subpath: 23.0-default/diskimage-stage1-amd64-cloudinit-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/diskimage
diskimage/qcow2: di-amd64-cloudinit-@[email protected]
diff --git a/releases/specs/amd64/diskimage-stage2-console.spec
b/releases/specs/amd64/diskimage-stage2-console.spec
index 640a7ac3..50863399 100644
--- a/releases/specs/amd64/diskimage-stage2-console.spec
+++ b/releases/specs/amd64/diskimage-stage2-console.spec
@@ -4,7 +4,7 @@ target: diskimage-stage2
rel_type: 23.0-default
profile: default/linux/amd64/23.0/no-multilib/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-default/diskimage-stage1-amd64-@TIMESTAMP@
+source_subpath: 23.0-default/diskimage-stage1-amd64-console-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/diskimage
diskimage/qcow2: di-amd64-console-@[email protected]
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 3cd52512..a6ece5ef 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -55,7 +55,7 @@
SET_nomultilib_openrc_23_SPECS="nomultilib/stage1-openrc-23.spec nomultilib/stag
SET_nomultilib_systemd_23_SPECS="nomultilib/stage1-systemd-23.spec
nomultilib/stage3-systemd-23.spec"
-SET_diskimage_23_SPECS="diskimage-stage1.spec diskimage-stage2-console.spec
diskimage-stage2-cloudinit.spec"
+SET_diskimage_23_SPECS="diskimage-stage1-console.spec
diskimage-stage2-console.spec diskimage-stage1-cloudinit.spec
diskimage-stage2-cloudinit.spec"
SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
