[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/amd64/

[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/amd64/

[Andreas K. Hüttel]

commit:     c2462b3949110dff30ce2fcfda77305b365b0701
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 13:39:05 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 13:39:48 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=c2462b39

Add and enable amd64 openrc 23.0 split-usr specs

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

 releases/specs/amd64/stage1-openrc-23-su.spec | 12 ++++++++++++
 releases/specs/amd64/stage3-openrc-23-su.spec | 10 ++++++++++
 tools/catalyst-auto-amd64.conf                |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/releases/specs/amd64/stage1-openrc-23-su.spec b/releases/specs/amd64/stage1-openrc-23-su.spec
new file mode 100644
index 00000000..ef4c52b5
--- /dev/null
+++ b/releases/specs/amd64/stage1-openrc-23-su.spec
@@ -0,0 +1,12 @@
+subarch: amd64
+target: stage1
+version_stamp: openrc-splitusr-@TIMESTAMP@
+rel_type: 23.0-splitusr
+profile: default/linux/amd64/23.0/split-usr
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-default/stage3-amd64-openrc-splitusr-latest
+compression_mode: pixz
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/releases/specs/amd64/stage3-openrc-23-su.spec b/releases/specs/amd64/stage3-openrc-23-su.spec
new file mode 100644
index 00000000..cdfad9c0
--- /dev/null
+++ b/releases/specs/amd64/stage3-openrc-23-su.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage3
+version_stamp: openrc-splitusr-@TIMESTAMP@
+rel_type: 23.0-splitusr
+profile: default/linux/amd64/23.0/split-usr
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-default/stage1-amd64-openrc-splitusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 4aa16c56..a57c8e14 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
 
 SETS="
 	openrc_23
+	openrc_23_su
 	systemd_23
 	nomultilib_openrc_23
 	nomultilib_systemd_23
@@ -85,6 +86,8 @@ SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec x32/stage3-systemd-mu.spec"
 SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
 SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec"
 
+SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
+
 SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
 SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec"
 

[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/amd64/

[Andreas K. Hüttel]

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-@TIMESTAMP@.qcow2
+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*
 		;;