commit: bc9d9dd9009fb100e543cf5b4f20a6f6e3f01b5a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 13:35:07 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 13:36:17 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bc9d9dd9
Also build cloud-init diskimage (not really functional yet)
Before this works, we need to get the cloud-init gentoo+systemd
functionality in (either as Gentoo backport or upstream).
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/amd64/diskimage-stage1.spec | 1 +
releases/specs/amd64/diskimage-stage2-cloudinit.spec | 17 +++++++++++++++++
tools/catalyst-auto-amd64.conf | 5 ++++-
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/releases/specs/amd64/diskimage-stage1.spec
b/releases/specs/amd64/diskimage-stage1.spec
index 8f1f7e33..98df5f44 100644
--- a/releases/specs/amd64/diskimage-stage1.spec
+++ b/releases/specs/amd64/diskimage-stage1.spec
@@ -17,6 +17,7 @@ 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
new file mode 100644
index 00000000..8ada1f37
--- /dev/null
+++ b/releases/specs/amd64/diskimage-stage2-cloudinit.spec
@@ -0,0 +1,17 @@
+subarch: amd64
+version_stamp: @TIMESTAMP@
+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@
+portage_confdir: @REPO_DIR@/releases/portage/isos
+
+diskimage/qcow2: di-amd64-cloudinit-@[email protected]
+diskimage/type: cloud-init
+
+boot/kernel: gentoo
+
+boot/kernel/gentoo/distkernel: yes
+boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid
-o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -I
busybox
+boot/kernel/gentoo/config:
/root/releng/releases/kconfig/amd64/dist-amd64-livecd.config
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 45350a8e..3cd52512 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"
+SET_diskimage_23_SPECS="diskimage-stage1.spec diskimage-stage2-console.spec
diskimage-stage2-cloudinit.spec"
SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
@@ -136,6 +136,9 @@ post_build() {
diskimage-stage2-console.spec)
upload di-amd64-console-${TIMESTAMP}.qcow2*
;;
+ diskimage-stage2-cloudinit.spec)
+ upload di-amd64-cloudinit-${TIMESTAMP}.qcow2*
+ ;;
x32/stage3-openrc-23.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
;;
