commit: ee7defb2acc29707173a34b3ebe152637828cbc1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 19:15:33 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 19:15:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ee7defb2
Add x86 23.0 builds and uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/x86/hardened/stage1-openrc-23.spec | 12 ++++++
releases/specs/x86/hardened/stage3-openrc-23.spec | 11 ++++++
releases/specs/x86/i686/stage1-openrc-23.spec | 12 ++++++
releases/specs/x86/i686/stage1-systemd-23.spec | 12 ++++++
releases/specs/x86/i686/stage3-openrc-23.spec | 11 ++++++
releases/specs/x86/i686/stage3-systemd-23.spec | 11 ++++++
releases/specs/x86/musl/stage1-23.spec | 13 +++++++
releases/specs/x86/musl/stage3-23.spec | 11 ++++++
tools/catalyst-auto-x86.conf | 46 +++++++++++++++++++++++
9 files changed, 139 insertions(+)
diff --git a/releases/specs/x86/hardened/stage1-openrc-23.spec
b/releases/specs/x86/hardened/stage1-openrc-23.spec
new file mode 100644
index 00000000..ca210e00
--- /dev/null
+++ b/releases/specs/x86/hardened/stage1-openrc-23.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: hardened-openrc-@TIMESTAMP@
+rel_type: 23.0-hardened
+profile: default/linux/x86/23.0/i686/hardened
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-hardened/stage3-i686-hardened-openrc-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/x86/hardened/stage3-openrc-23.spec
b/releases/specs/x86/hardened/stage3-openrc-23.spec
new file mode 100644
index 00000000..87356fce
--- /dev/null
+++ b/releases/specs/x86/hardened/stage3-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: hardened-openrc-@TIMESTAMP@
+rel_type: 23.0-hardened
+profile: default/linux/x86/23.0/i686/hardened
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-hardened/stage1-i686-hardened-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686_hardened
diff --git a/releases/specs/x86/i686/stage1-openrc-23.spec
b/releases/specs/x86/i686/stage1-openrc-23.spec
new file mode 100644
index 00000000..20be8881
--- /dev/null
+++ b/releases/specs/x86/i686/stage1-openrc-23.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: openrc-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-i686-openrc-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/x86/i686/stage1-systemd-23.spec
b/releases/specs/x86/i686/stage1-systemd-23.spec
new file mode 100644
index 00000000..e7a08b22
--- /dev/null
+++ b/releases/specs/x86/i686/stage1-systemd-23.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-i686-systemd-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/x86/i686/stage3-openrc-23.spec
b/releases/specs/x86/i686/stage3-openrc-23.spec
new file mode 100644
index 00000000..6fbcd4fc
--- /dev/null
+++ b/releases/specs/x86/i686/stage3-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: openrc-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-i686-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686
diff --git a/releases/specs/x86/i686/stage3-systemd-23.spec
b/releases/specs/x86/i686/stage3-systemd-23.spec
new file mode 100644
index 00000000..28965d68
--- /dev/null
+++ b/releases/specs/x86/i686/stage3-systemd-23.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-i686-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686
diff --git a/releases/specs/x86/musl/stage1-23.spec
b/releases/specs/x86/musl/stage1-23.spec
new file mode 100644
index 00000000..912fc4f0
--- /dev/null
+++ b/releases/specs/x86/musl/stage1-23.spec
@@ -0,0 +1,13 @@
+subarch: i686
+target: stage1
+version_stamp: musl-@TIMESTAMP@
+rel_type: 23.0-musl
+profile: default/linux/x86/23.0/i686/musl
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-musl/stage3-i686-musl-latest
+chost: i686-pc-linux-musl
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
diff --git a/releases/specs/x86/musl/stage3-23.spec
b/releases/specs/x86/musl/stage3-23.spec
new file mode 100644
index 00000000..cb252f15
--- /dev/null
+++ b/releases/specs/x86/musl/stage3-23.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: musl-@TIMESTAMP@
+rel_type: 23.0-musl
+profile: default/linux/x86/23.0/i686/musl
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-musl/stage1-i686-musl-@TIMESTAMP@
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+compression_mode: pixz
+binrepo_path: x86/binpackages/23.0/i686_musl
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index c30fd4f4..2e8d5b86 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -16,22 +16,41 @@ SETS="
i686_systemd_mu
hardened_openrc
musl
+ i486_openrc_23
+ i486_systemd_23
+ i686_openrc_23
+ i686_systemd_23
+ hardened_openrc_23
"
+# musl_23
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec"
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec
i486/installcd-stage2-minimal-openrc.spec"
+SET_i486_openrc_23_SPECS="i486/stage1-openrc-23.spec
i486/stage3-openrc-23.spec"
+
SET_i486_systemd_mu_SPECS="i486/stage1-systemd-mu.spec
i486/stage3-systemd-mu.spec"
+SET_i486_systemd_23_SPECS="i486/stage1-systemd-23.spec
i486/stage3-systemd-23.spec"
+
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
+SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec
i686/stage3-openrc-23.spec"
+
SET_i686_systemd_mu_SPECS="i686/stage1-systemd-mu.spec
i686/stage3-systemd-mu.spec"
+SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec
i686/stage3-systemd-23.spec"
+
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec
hardened/admincd-stage2-openrc.spec"
+SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
+
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
+SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
@@ -78,6 +97,17 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd ${BUILD_SRCDIR_BASE}/builds/23.0-default >/dev/null || exit
+ case ${spec} in
+ i486/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i486" x86/23.0/i486
+ ;;
+ i686/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i686" x86/23.0/i686
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd ${BUILD_SRCDIR_BASE}/builds/mergedusr >/dev/null || exit
case ${spec} in
i486/stage3-systemd-mu.spec)
@@ -101,6 +131,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd ${BUILD_SRCDIR_BASE}/builds/23.0-hardened >/dev/null || exit
+ case ${spec} in
+ hardened/stage3-openrc-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-i686" x86/23.0/i686_hardened
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)
@@ -109,6 +147,14 @@ post_build() {
;;
esac
popd >/dev/null || exit
+
+ pushd ${BUILD_SRCDIR_BASE}/builds/23.0-musl >/dev/null || exit
+ case ${spec} in
+ musl/stage3-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-i686" x86/23.0/i686_musl
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
