[gentoo-commits] proj/releng:master commit in: tools/
commit: 3152e81e3a652f5a72a4975e9f0e1c37c6efce87
Author: Robin H. Johnson gentoo org>
AuthorDate: Tue Jan 21 20:56:48 2025 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Tue Jan 21 20:56:48 2025 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=3152e81e
tools: drop duplicate mails for catalyst
Signed-off-by: Robin H. Johnson gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 015dd5ed..213cdcdc 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -9,7 +9,7 @@ REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")")
# Set up defaults that config files can override if they want.
SUBARCH=$(uname -m)
-EMAIL_TO="rel...@gentoo.org,gentoo-releng-autobui...@lists.gentoo.org"
+EMAIL_TO="gentoo-releng-autobui...@lists.gentoo.org" # make sure to subscribe
new workers to the nomail version of the list!
# Use full hostname by default as Gentoo servers will reject short names.
EMAIL_FROM="catalyst@$(hostname -f)"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
[gentoo-commits] proj/releng:master commit in: tools/
commit: 0cc354e9fc15b0e38151c624bd0b0d7a100ba876
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Dec 23 21:36:06 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Dec 23 21:36:06 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=0cc354e9
Build and upload arm64 (aarch64) disk images
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-arm64.conf | 9 +
1 file changed, 9 insertions(+)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 908012d3..bd34b267 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -10,6 +10,7 @@ SETS="
openrc_23
openrc_23_su
systemd_23
+ diskimage_23
llvm_openrc_23
llvm_systemd_23
musl_23
@@ -24,6 +25,8 @@ 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
stage3d-systemd-23.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"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
@@ -77,6 +80,12 @@ post_build() {
installcd-stage2-minimal.spec)
upload install-arm64-*${TIMESTAMP}*.iso*
;;
+ diskimage-stage2-console.spec)
+ upload di-arm64-console-${TIMESTAMP}.qcow2*
+ ;;
+ diskimage-stage2-cloudinit.spec)
+ upload di-arm64-cloudinit-${TIMESTAMP}.qcow2*
+ ;;
esac
popd >/dev/null
[gentoo-commits] proj/releng:master commit in: tools/
commit: 38cfaea5468127fdade4c2e65156e7858f2e1eb1
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Dec 13 13:10:07 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Dec 13 13:10:07 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=38cfaea5
Upload also cloud-init diskimage file
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index d349e9a7..3cd52512 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -137,8 +137,7 @@ post_build() {
upload di-amd64-console-${TIMESTAMP}.qcow2*
;;
diskimage-stage2-cloudinit.spec)
- # upload di-amd64-cloudinit-${TIMESTAMP}.qcow2*
- echo do not yet upload di-amd64-cloudinit-${TIMESTAMP}.qcow2*
+ upload di-amd64-cloudinit-${TIMESTAMP}.qcow2*
;;
x32/stage3-openrc-23.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
[gentoo-commits] proj/releng:master commit in: tools/
commit: 9568de1c66bbdc5ded1e5c30303666315e4c5e6a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 7 15:42:59 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 7 15:42:59 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=9568de1c
Build but do not yet upload cloud-init images, they won't work
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 3cd52512..d349e9a7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -137,7 +137,8 @@ post_build() {
upload di-amd64-console-${TIMESTAMP}.qcow2*
;;
diskimage-stage2-cloudinit.spec)
- upload di-amd64-cloudinit-${TIMESTAMP}.qcow2*
+ # upload di-amd64-cloudinit-${TIMESTAMP}.qcow2*
+ echo do not yet upload di-amd64-cloudinit-${TIMESTAMP}.qcow2*
;;
x32/stage3-openrc-23.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/amd64/
commit: bc9d9dd9009fb100e543cf5b4f20a6f6e3f01b5a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 7 13:35:07 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 7 13:36:17 2024 +
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 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 ..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*
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: 260e61e60eb517e156c1c3d838cb6485394b0080
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Nov 8 20:23:56 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Nov 8 20:23:56 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=260e61e6
Enable experimental diskimage builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 6 ++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index da417c16..45350a8e 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -16,6 +16,7 @@ SETS="
systemd_23
nomultilib_openrc_23
nomultilib_systemd_23
+ diskimage_23
llvm_openrc_23
llvm_systemd_23
hardened_openrc_23
@@ -54,6 +55,8 @@
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_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
@@ -130,6 +133,9 @@ post_build() {
nomultilib/stage3-systemd-23.spec)
upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
;;
+ diskimage-stage2-console.spec)
+ upload di-amd64-console-${TIMESTAMP}.qcow2*
+ ;;
x32/stage3-openrc-23.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: 85bed990ed1bc82fa1ee030cbf2f23d684be056c
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Nov 2 15:12:39 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Nov 2 15:12:39 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=85bed990
Fix filenames for ssemath
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-x86.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index cfa7d825..ea4b78d8 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -104,11 +104,11 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-time64 >/dev/null || exit
case ${spec} in
i686-t64/stage3-openrc-23.spec)
- upload stage3-i686-t64-openrc-${TIMESTAMP}.tar.xz*
+ upload stage3-i686-ssemath-t64-openrc-${TIMESTAMP}.tar.xz*
;;
i686-t64/stage3-systemd-23.spec)
- upload stage3-i686-t64-systemd-${TIMESTAMP}.tar.xz*
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-time64/stage3-i686-t64" x86/23.0/i686-t64
+ upload stage3-i686-ssemath-t64-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-time64/stage3-i686-ssemath"
x86/23.0/i686-ssemath-t64
;;
esac
popd >/dev/null || exit
[gentoo-commits] proj/releng:master commit in: tools/
commit: 3930b076a9b182d1cc61e998af34a0d7de3d3e4e
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Sep 15 00:44:02 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Sep 15 00:44:02 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=3930b076
Add missing backslash (for less backslash)
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cc532c3d..015dd5ed 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -440,7 +440,7 @@ run_catalyst_commands() {
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
- -e "s:@DATESTAMP@:${DATESTAMP}:g"
+ -e "s:@DATESTAMP@:${DATESTAMP}:g" \
-e "s:@REPO_DIR@:${REPO_DIR}:g" \
-e "s:@TREEISH@:${TREEISH}:g" \
"${i}"
[gentoo-commits] proj/releng:master commit in: tools/
commit: f1c2b6d186ec30fb3c634875e1d7eafc2f63f044
Author: Ben Kohler gentoo org>
AuthorDate: Sat Sep 14 12:06:36 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Sat Sep 14 12:06:36 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f1c2b6d1
tools/catalyst-auto: replace DATESTAMP in specs as well
We started using this variable in specs but it's not in the sed list
yet.
Signed-off-by: Ben Kohler gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index d1a72d91..cc532c3d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -440,6 +440,7 @@ run_catalyst_commands() {
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
+ -e "s:@DATESTAMP@:${DATESTAMP}:g"
-e "s:@REPO_DIR@:${REPO_DIR}:g" \
-e "s:@TREEISH@:${TREEISH}:g" \
"${i}"
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/x86/i686-t64/
commit: 13741803bca5938512da2eb037e752e65b1d3e5d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Aug 19 19:00:53 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Aug 19 19:00:53 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=13741803
Add specs for experimental i686 t64 build
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/x86/i686-t64/stage1-openrc-23.spec | 12
releases/specs/x86/i686-t64/stage1-systemd-23.spec | 12
releases/specs/x86/i686-t64/stage3-openrc-23.spec | 11 +++
releases/specs/x86/i686-t64/stage3-systemd-23.spec | 11 +++
tools/catalyst-auto-x86.conf | 19 +--
5 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/releases/specs/x86/i686-t64/stage1-openrc-23.spec
b/releases/specs/x86/i686-t64/stage1-openrc-23.spec
new file mode 100644
index ..c6585f2f
--- /dev/null
+++ b/releases/specs/x86/i686-t64/stage1-openrc-23.spec
@@ -0,0 +1,12 @@
+subarch: i686-t64
+target: stage1
+version_stamp: openrc-@TIMESTAMP@
+rel_type: 23.0-time64
+profile: default/linux/x86/23.0/i686/time64
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-time64/stage3-i686-t64-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-t64/stage1-systemd-23.spec
b/releases/specs/x86/i686-t64/stage1-systemd-23.spec
new file mode 100644
index ..0286ce97
--- /dev/null
+++ b/releases/specs/x86/i686-t64/stage1-systemd-23.spec
@@ -0,0 +1,12 @@
+subarch: i686-t64
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: 23.0-time64
+profile: default/linux/x86/23.0/i686/time64/systemd
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-time64/stage3-i686-t64-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-t64/stage3-openrc-23.spec
b/releases/specs/x86/i686-t64/stage3-openrc-23.spec
new file mode 100644
index ..73dc09b2
--- /dev/null
+++ b/releases/specs/x86/i686-t64/stage3-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: i686-t64
+target: stage3
+version_stamp: openrc-@TIMESTAMP@
+rel_type: 23.0-time64
+profile: default/linux/x86/23.0/i686/time64
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-time64/stage1-i686-t64-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686-t64
diff --git a/releases/specs/x86/i686-t64/stage3-systemd-23.spec
b/releases/specs/x86/i686-t64/stage3-systemd-23.spec
new file mode 100644
index ..97427b44
--- /dev/null
+++ b/releases/specs/x86/i686-t64/stage3-systemd-23.spec
@@ -0,0 +1,11 @@
+subarch: i686-t64
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+rel_type: 23.0-time64
+profile: default/linux/x86/23.0/i686/time64/systemd
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-time64/stage1-i686-t64-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686-t64
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 1560c2f7..cfa7d825 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -16,6 +16,8 @@ SETS="
i686_systemd_23
i686_ssemath_openrc_23
i686_ssemath_systemd_23
+ i686_t64_openrc_23
+ i686_t64_systemd_23
hardened_openrc_23
musl_23
"
@@ -26,13 +28,14 @@
SET_i486_openrc_23_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/instal
SET_i486_systemd_23_SPECS="i486/stage1-systemd-23.spec
i486/stage3-systemd-23.spec"
SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec
i686/stage3-openrc-23.spec"
-
SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec
i686/stage3-systemd-23.spec"
SET_i686_ssemath_openrc_23_SPECS="i686-ssemath/stage1-openrc-23.spec
i686-ssemath/stage3-openrc-23.spec"
-
SET_i686_ssemath_systemd_23_SPECS="i686-ssemath/stage1-systemd-23.spec
i686-ssemath/stage3-systemd-23.spec"
+SET_i686_t64_openrc_23_SPECS="i686-t64/stage1-openrc-23.spec
i686-t64/stage3-openrc-23.spec"
+SET_i686_t64_systemd_23_SPECS="i686-t64/stage1-systemd-23.spec
i686-t64/stage3-systemd-23.spec"
+
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec
hardened/admincd-stage2-openrc.spec"
@@ -98,6 +101,18 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd ${BUILD_SRCDIR_BASE}/builds/23.0-time64 >/dev/null || exit
+ case ${spec} in
+ i686-t64/stage3-openrc-23.spec)
+ upload st
[gentoo-commits] proj/releng:master commit in: tools/
commit: bbcfddf456fdf1fca2b36cb0386df93cbc211305
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jul 29 21:43:53 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Jul 29 21:44:20 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=bbcfddf4
catalyst-auto: Replace more than one / with _ in logfile name
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 04db65e7..d1a72d91 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -483,7 +483,7 @@ run_catalyst_commands() {
fi
for i in ${!specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e
's:/:_:' -e 's:\.spec$::').log"
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e
's:/:_:g' -e 's:\.spec$::').log"
specpath=$(readlink -f "${i}")
run_cmd "${LOGFILE}" "${timeprefix[@]}"
catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
if [[ $? != 0 ]]; then
@@ -496,7 +496,7 @@ run_catalyst_commands() {
done
for i in ${!optional_specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e
's:/:_:' -e 's:\.spec$::').log"
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e
's:/:_:g' -e 's:\.spec$::').log"
specpath=$(readlink -f "${i}")
run_cmd "${LOGFILE}" "${timeprefix[@]}"
catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
if [[ $? != 0 ]]; then
[gentoo-commits] proj/releng:master commit in: tools/
commit: 35d58c3943b1a0f29d5508acd7fbe4b97c45bf67
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Jun 11 18:28:58 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Jun 11 18:28:58 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=35d58c39
Enable x86 i686-ssemath builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-x86.conf | 13 +
1 file changed, 13 insertions(+)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index b3fbb54a..1560c2f7 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -14,6 +14,8 @@ SETS="
i486_systemd_23
i686_openrc_23
i686_systemd_23
+ i686_ssemath_openrc_23
+ i686_ssemath_systemd_23
hardened_openrc_23
musl_23
"
@@ -27,6 +29,10 @@ SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec
i686/stage3-openrc-23.spec"
SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec
i686/stage3-systemd-23.spec"
+SET_i686_ssemath_openrc_23_SPECS="i686-ssemath/stage1-openrc-23.spec
i686-ssemath/stage3-openrc-23.spec"
+
+SET_i686_ssemath_systemd_23_SPECS="i686-ssemath/stage1-systemd-23.spec
i686-ssemath/stage3-systemd-23.spec"
+
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec
hardened/admincd-stage2-openrc.spec"
@@ -82,6 +88,13 @@ post_build() {
upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i686" x86/23.0/i686
;;
+ i686-ssemath/stage3-openrc-23.spec)
+ upload stage3-i686-ssemath-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ i686-ssemath/stage3-systemd-23.spec)
+ upload stage3-i686-ssemath-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i686-ssemath"
x86/23.0/i686-ssemath
+ ;;
esac
popd >/dev/null || exit
[gentoo-commits] proj/releng:master commit in: tools/
commit: d7d6f5a75f3a1cdc868065e6bf618391a2f87c3b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Jun 1 15:48:16 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Jun 1 15:48:16 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7d6f5a7
Clean up catalyst-auto configurations
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 73 -
tools/catalyst-auto-arm.conf | 69
tools/catalyst-auto-arm64.conf | 42 ---
tools/catalyst-auto-hppa.conf| 15 --
tools/catalyst-auto-ia64.conf| 5 --
tools/catalyst-auto-ppc.conf | 20 ---
tools/catalyst-auto-ppc64le.conf | 21
tools/catalyst-auto-qemu-alpha.conf | 10
tools/catalyst-auto-qemu-arm64.conf | 10
tools/catalyst-auto-qemu-loong.conf | 10
tools/catalyst-auto-qemu-m68k.conf | 14 -
tools/catalyst-auto-qemu-mips-common | 102 ---
tools/catalyst-auto-qemu-riscv.conf | 17 --
tools/catalyst-auto-s390x.conf | 15 --
tools/catalyst-auto-sparc64.conf | 15 --
tools/catalyst-auto-x86.conf | 35
16 files changed, 473 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 788f0f1b..da417c16 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -29,31 +29,6 @@ SETS="
x32_systemd_23
"
-# 17.0
-
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec"
-
-SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
-
-SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec
hardened-selinux/stage3-openrc.spec"
-
-SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec
hardened-nomultilib-selinux/stage3-openrc.spec"
-
-SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec
hardened-nomultilib/stage3-openrc.spec"
-
-SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec
nomultilib/stage3-openrc.spec"
-
-SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
-
-SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
-
-SET_musl_llvm_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
-
-SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
-
-SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
-
# 23.0
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -124,14 +99,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
- case ${spec} in
- x32/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
case ${spec} in
stage3-openrc-23.spec)
@@ -181,14 +148,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
- case ${spec} in
- clang/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
case ${spec} in
llvm/stage3-openrc-23.spec)
@@ -201,14 +160,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
- case ${spec} in
- hardened/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
@@ -236,14 +187,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
- case ${spec} in
- musl/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-amd64" amd64/17.1/x86-64_musl
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
@@ -253,14 +196,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
- case ${spec} in
- musl-clang/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDI
[gentoo-commits] proj/releng:master commit in: tools/
commit: 3b62d92a9e034ec3cb8a750a8313474f19700e41
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Jun 1 14:21:51 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Jun 1 14:21:51 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=3b62d92a
Stop all 17.0 / 20.0 / 22.0 profile builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 11 ---
tools/catalyst-auto-arm.conf | 10 --
tools/catalyst-auto-arm64.conf | 5 -
tools/catalyst-auto-ia64.conf| 1 -
tools/catalyst-auto-ppc.conf | 4
tools/catalyst-auto-ppc64le.conf | 4
tools/catalyst-auto-qemu-alpha.conf | 1 -
tools/catalyst-auto-qemu-arm64.conf | 1 -
tools/catalyst-auto-qemu-loong.conf | 1 -
tools/catalyst-auto-qemu-m68k.conf | 2 --
tools/catalyst-auto-qemu-mips-common | 8
tools/catalyst-auto-qemu-riscv.conf | 5 -
tools/catalyst-auto-s390x.conf | 2 --
tools/catalyst-auto-sparc64.conf | 2 --
tools/catalyst-auto-x86.conf | 4
15 files changed, 4 insertions(+), 57 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 933b04df..788f0f1b 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -27,17 +27,6 @@ SETS="
musl_llvm_23
x32_openrc_23
x32_systemd_23
- openrc
- nomultilib_openrc
- llvm_openrc
- hardened_openrc
- hardened_nomultilib_openrc
- hardened_selinux_openrc
- hardened_nomultilib_selinux_openrc
- musl
- musl_hardened
- musl_llvm
- x32_openrc
"
# 17.0
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index cce9a0f8..d530c5ea 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -27,16 +27,6 @@ SETS="
armv7a_sf_systemd_23
armv7a_hf_musl_openrc_23
armv7a_hf_musl_hardened_openrc_23
- armv4tl_openrc
- armv5tel_openrc
- armv6j_hf_openrc
- armv6j_sf_openrc
- armv6j_hf_musl_openrc
- armv6j_hf_musl_hardened_openrc
- armv7a_hf_openrc
- armv7a_sf_openrc
- armv7a_hf_musl_openrc
- armv7a_hf_musl_hardened_openrc
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec
armv4tl/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 28e51b4b..e32763e3 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -15,11 +15,6 @@ SETS="
musl_23
musl_hardened_23
musl_llvm_23
- openrc
- llvm_openrc
- musl
- musl_hardened
- musl_llvm
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b4500e5a..6527141e 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -8,7 +8,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SETS="
openrc_23
systemd_23
- openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 1a195805..b62aaa84 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -12,10 +12,6 @@ SETS="
openrc_64_23
systemd_64_23
musl_hardened_64_23
- openrc
- musl_hardened
- openrc_64
- musl_hardened_64
"
SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index aba6051a..a6d46bd9 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -12,10 +12,6 @@ SETS="
systemd_power9le_23
musl_hardened_23
musl_hardened_power9le_23
- openrc
- openrc_power9le
- musl_hardened
- musl_hardened_power9le
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-alpha.conf
b/tools/catalyst-auto-qemu-alpha.conf
index d62670b1..b2946afc 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -9,7 +9,6 @@ EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
SETS="
openrc23
systemd23
- openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-arm64.conf
b/tools/catalyst-auto-qemu-arm64.conf
index 2afa2c87..0fa4f46a 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -9,7 +9,6 @@ SUBARCH=aarch64_be
SETS="
openrc_23
systemd_23
- openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-loong.conf
b/tools/catalyst-auto-qemu-loong.conf
index b35f9216..4146886f 100644
--- a/tools/catalyst-auto-qemu-loong.
[gentoo-commits] proj/releng:master commit in: tools/
commit: 71cef86aea815fb2c0439bec8a35e930d0bc0574 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon May 6 11:16:36 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon May 6 11:16:36 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=71cef86a Drop hppa 17.0 builds (hake is too slow for building both) Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-hppa.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index 0ddc5b80..a040f876 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -10,8 +10,6 @@ SETS=" hppa11_systemd_23 hppa20_openrc_23 hppa20_systemd_23 - hppa11_openrc - hppa20_openrc " SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
[gentoo-commits] proj/releng:master commit in: tools/
commit: a1f68f259d5d5954192b3a1497c960972e9be4fe Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu May 2 07:32:12 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu May 2 07:32:36 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=a1f68f25 Enable riscv32 musl builds Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-qemu-riscv.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 63d79a05..d88df515 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -21,16 +21,16 @@ SETS=" multilib_systemd_23 ilp32d_openrc_23 ilp32d_systemd_23 + ilp32d_musl_23 ilp32_openrc_23 ilp32_systemd_23 + ilp32_musl_23 lp64d_openrc lp64d_musl lp64_openrc lp64_musl multilib_openrc " -# ilp32d_musl_23 -# ilp32_musl_23 SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec" SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/rv32_ilp32/
commit: 8a9b3d1982c074ebbde86b9a217c0d36f00fa9bc Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Apr 16 10:38:46 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Apr 16 10:38:46 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=8a9b3d19 Add and enable rv32 ilp32 builds Signed-off-by: Andreas K. Hüttel gentoo.org> .../riscv/rv32_ilp32/stage1-ilp32-musl-23.spec | 14 ++ .../riscv/rv32_ilp32/stage1-ilp32-openrc-23.spec | 14 ++ .../riscv/rv32_ilp32/stage1-ilp32-systemd-23.spec | 14 ++ .../riscv/rv32_ilp32/stage3-ilp32-musl-23.spec | 13 + .../riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec | 13 + .../riscv/rv32_ilp32/stage3-ilp32-systemd-23.spec | 13 + tools/catalyst-auto-qemu-riscv.conf| 18 ++ 7 files changed, 99 insertions(+) diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-musl-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-musl-23.spec new file mode 100644 index ..b7eb9101 --- /dev/null +++ b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-musl-23.spec @@ -0,0 +1,14 @@ +subarch: rv32_ilp32_musl +target: stage1 +version_stamp: @TIMESTAMP@ +interpreter: /usr/bin/qemu-riscv32 +rel_type: 23.0-musl +profile: default/linux/riscv/23.0/rv32/ilp32/musl +snapshot_treeish: @TREEISH@ +source_subpath: 23.0-musl/stage3-rv32_ilp32_musl-latest +compression_mode: pixz +decompressor_search_order: xz bzip2 +update_seed: yes +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu +portage_prefix: releng diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-openrc-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-openrc-23.spec new file mode 100644 index ..35756978 --- /dev/null +++ b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-openrc-23.spec @@ -0,0 +1,14 @@ +subarch: rv32_ilp32 +target: stage1 +version_stamp: openrc-@TIMESTAMP@ +interpreter: /usr/bin/qemu-riscv32 +rel_type: 23.0-default +profile: default/linux/riscv/23.0/rv32/ilp32 +snapshot_treeish: @TREEISH@ +source_subpath: 23.0-default/stage3-rv32_ilp32-openrc-latest +compression_mode: pixz +decompressor_search_order: xz bzip2 +update_seed: yes +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu +portage_prefix: releng diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-systemd-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-systemd-23.spec new file mode 100644 index ..86da765e --- /dev/null +++ b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-systemd-23.spec @@ -0,0 +1,14 @@ +subarch: rv32_ilp32 +target: stage1 +version_stamp: systemd-@TIMESTAMP@ +interpreter: /usr/bin/qemu-riscv32 +rel_type: 23.0-default +profile: default/linux/riscv/23.0/rv32/ilp32/systemd +snapshot_treeish: @TREEISH@ +source_subpath: 23.0-default/stage3-rv32_ilp32-systemd-latest +compression_mode: pixz +decompressor_search_order: xz bzip2 +update_seed: yes +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu +portage_prefix: releng diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-musl-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-musl-23.spec new file mode 100644 index ..77b65c82 --- /dev/null +++ b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-musl-23.spec @@ -0,0 +1,13 @@ +subarch: rv32_ilp32_musl +target: stage3 +version_stamp: @TIMESTAMP@ +interpreter: /usr/bin/qemu-riscv32 +rel_type: 23.0-musl +profile: default/linux/riscv/23.0/rv32/ilp32/musl +snapshot_treeish: @TREEISH@ +source_subpath: 23.0-musl/stage1-rv32_ilp32_musl-@TIMESTAMP@ +compression_mode: pixz +decompressor_search_order: xz bzip2 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu +portage_prefix: releng +binrepo_path: riscv/binpackages/23.0/rv32_ilp32_musl diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec new file mode 100644 index ..1fa517a0 --- /dev/null +++ b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec @@ -0,0 +1,13 @@ +subarch: rv32_ilp32 +target: stage3 +version_stamp: openrc-@TIMESTAMP@ +interpreter: /usr/bin/qemu-riscv32 +rel_type: 23.0-default +profile: default/linux/riscv/23.0/rv32/ilp32 +snapshot_treeish: @TREEISH@ +source_subpath: 23.0-default/stage1-rv32_ilp32-openrc-@TIMESTAMP@ +compression_mode: pixz +decompressor_search_order: xz bzip2 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu +portage_prefix: releng +binrepo_path: riscv/binpackages/23.0/rv32_ilp32 diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-systemd-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-systemd-23.spec new file mode 100644 index ..e6b64104 --- /dev/null +++ b/releases/specs-qemu/riscv/rv32_ilp32/s
[gentoo-commits] proj/releng:master commit in: tools/
commit: fe65e350f95103437e322c9e149840760553561a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Apr 6 14:35:19 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Apr 6 14:35:19 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=fe65e350
Enable riscv RV32 ILP32D builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 30 --
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index 328b500a..7114c491 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,12 +19,15 @@ SETS="
lp64_musl_23
multilib_openrc_23
multilib_systemd_23
+ ilp32d_openrc_23
+ ilp32d_systemd_23
lp64d_openrc
lp64d_musl
lp64_openrc
lp64_musl
multilib_openrc
"
+# ilp32d_musl_23
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
@@ -45,6 +48,10 @@ SET_lp64_systemd_23_SPECS="stage1-lp64-systemd-23.spec
stage3-lp64-systemd-23.sp
SET_multilib_openrc_23_SPECS="stage1-multilib-openrc-23.spec
stage3-multilib-openrc-23.spec"
SET_multilib_systemd_23_SPECS="stage1-multilib-systemd-23.spec
stage3-multilib-systemd-23.spec"
+SET_ilp32d_musl_23_SPECS="rv32_ilp32d/stage1-ilp32d-musl-23.spec
rv32_ilp32d/stage3-ilp32d-musl-23.spec"
+SET_ilp32d_openrc_23_SPECS="rv32_ilp32d/stage1-ilp32d-openrc-23.spec
rv32_ilp32d/stage3-ilp32d-openrc-23.spec"
+SET_ilp32d_systemd_23_SPECS="rv32_ilp32d/stage1-ilp32d-systemd-23.spec
rv32_ilp32d/stage3-ilp32d-systemd-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -71,6 +78,10 @@ post_build() {
upload
builds/23.0-default/stage3-rv64_lp64d-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
packages/23.0-default/stage3-rv64_lp64d riscv/23.0/rv64_lp64d
;;
+ stage3-lp64d-musl-23.spec)
+ upload
builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages
packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl
+ ;;
stage3-lp64-openrc-23.spec)
upload
builds/23.0-default/stage3-rv64_lp64-openrc-${TIMESTAMP}*.xz*
;;
@@ -78,6 +89,10 @@ post_build() {
upload
builds/23.0-default/stage3-rv64_lp64-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
packages/23.0-default/stage3-rv64_lp64 riscv/23.0/rv64_lp64
;;
+ stage3-lp64-musl-23.spec)
+ upload
builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages
packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl
+ ;;
stage3-multilib-openrc-23.spec)
upload
builds/23.0-default/stage3-rv64_multilib-openrc-${TIMESTAMP}*.xz*
;;
@@ -85,13 +100,16 @@ post_build() {
upload
builds/23.0-default/stage3-rv64_multilib-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
packages/23.0-default/stage3-rv64_multilib riscv/23.0/rv64_multilib
;;
- stage3-lp64d-musl-23.spec)
- upload
builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz*
- upsync_binpackages
packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl
+ rv32_ilp32d/stage3-ilp32d-openrc-23.spec)
+ upload
builds/23.0-default/stage3-rv32_ilp32d-openrc-${TIMESTAMP}*.xz*
;;
- stage3-lp64-musl-23.spec)
- upload
builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz*
- upsync_binpackages
packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl
+ rv32_ilp32d/stage3-ilp32d-systemd-23.spec)
+ upload
builds/23.0-default/stage3-rv32_ilp32d-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages
packages/23.0-default/stage3-rv32_ilp32d riscv/23.0/rv32_ilp32d
+ ;;
+ rv32_ilp32d/stage3-ilp32d-musl-23.spec)
+ upload
builds/23.0-musl/stage3-rv32_ilp32d_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages
packages/23.0-musl/stage3-rv32_ilp32d_musl riscv/23.0/rv32_ilp32d_musl
;;
stage3*openrc.spec)
upsync_binpackages packages/default/stage3-rv64_lp64d
riscv/20.0/rv64_lp64d
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/x86/hardened/, releases/specs/x86/i486/
commit: 8436dbabb6bca9b57a9843cd0238958ee1701fcd Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Apr 5 21:51:19 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Apr 5 21:51:19 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=8436dbab Convert x86 boot media to 23.0 Signed-off-by: Andreas K. Hüttel gentoo.org> .../specs/x86/hardened/admincd-stage1-openrc.spec | 6 +-- .../specs/x86/hardened/admincd-stage2-openrc.spec | 46 +++--- .../specs/x86/i486/installcd-stage1-openrc.spec| 6 +-- .../x86/i486/installcd-stage2-minimal-openrc.spec | 46 +++--- tools/catalyst-auto-x86.conf | 16 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/releases/specs/x86/hardened/admincd-stage1-openrc.spec b/releases/specs/x86/hardened/admincd-stage1-openrc.spec index 8344b279..52174cc0 100644 --- a/releases/specs/x86/hardened/admincd-stage1-openrc.spec +++ b/releases/specs/x86/hardened/admincd-stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: i686 version_stamp: hardened-openrc-@TIMESTAMP@ target: livecd-stage1 -rel_type: hardened -profile: default/linux/x86/17.0/hardened +rel_type: 23.0-hardened +profile: default/linux/x86/23.0/hardened snapshot_treeish: @TREEISH@ -source_subpath: hardened/stage3-i686-hardened-openrc-@TIMESTAMP@ +source_subpath: 23.0-hardened/stage3-i686-hardened-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec index 73aa8cbd..b567108c 100644 --- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec +++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec @@ -1,10 +1,10 @@ subarch: i686 version_stamp: hardened-openrc-@TIMESTAMP@ target: livecd-stage2 -rel_type: hardened -profile: default/linux/x86/17.0/hardened +rel_type: 23.0-hardened +profile: default/linux/x86/23.0/hardened snapshot_treeish: @TREEISH@ -source_subpath: hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@ +source_subpath: 23.0-hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: dokeymap @@ -74,8 +74,8 @@ livecd/empty: /etc/modules.autoload.d /etc/runlevels/single /etc/skel - /lib/dev-state - /lib/udev-state + /usr/lib/dev-state + /usr/lib/udev-state /root/.ccache /tmp /usr/diet/include @@ -147,17 +147,17 @@ livecd/rm: /etc/make.profile /etc/man.conf /etc/resolv.conf - /lib*/*.a - /lib*/*.la - /lib*/cpp + /usr/lib*/*.a + /usr/lib*/*.la + /usr/lib*/cpp /root/.bash_history /root/.viminfo - /sbin/*.static - /sbin/fsck.cramfs - /sbin/fsck.minix - /sbin/mkfs.bfs - /sbin/mkfs.cramfs - /sbin/mkfs.minix + /usr/bin/*.static + /usr/bin/fsck.cramfs + /usr/bin/fsck.minix + /usr/bin/mkfs.bfs + /usr/bin/mkfs.cramfs + /usr/bin/mkfs.minix /usr/bin/addr2line /usr/bin/ar /usr/bin/as @@ -200,15 +200,15 @@ livecd/rm: /usr/lib*/*.la /usr/lib*/perl5/site_perl /usr/lib*/gcc-lib/*/*/libgcj* - /usr/sbin/archive-conf - /usr/sbin/dispatch-conf - /usr/sbin/emaint - /usr/sbin/env-update - /usr/sbin/etc-update - /usr/sbin/fb* - /usr/sbin/fixpackages - /usr/sbin/quickpkg - /usr/sbin/regenworld + /usr/bin/archive-conf + /usr/bin/dispatch-conf + /usr/bin/emaint + /usr/bin/env-update + /usr/bin/etc-update + /usr/bin/fb* + /usr/bin/fixpackages + /usr/bin/quickpkg + /usr/bin/regenworld /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* diff --git a/releases/specs/x86/i486/installcd-stage1-openrc.spec b/releases/specs/x86/i486/installcd-stage1-openrc.spec index 45dc08c9..a7eb7ce7 100644 --- a/releases/specs/x86/i486/installcd-stage1-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: i486 version_stamp: openrc-@TIMESTAMP@ target: livecd-stage1 -rel_type: default -profile: default/linux/x86/17.0 +rel_type: 23.0-default +profile: default/linux/x86/23.0/i486 snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-i486-openrc-@TIMESTAMP@ +source_subpath: 23.0-default/stage3-i486-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec index 787eaa2f..c2ab6e56 100644 --- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec @@ -1,10 +1,10 @@ sub
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/sparc/sparc64/
commit: cf123d31a6ddf5a3570095cf0103517a6667a577
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Apr 5 21:24:23 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Apr 5 21:24:23 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=cf123d31
Switch sparc boot media to 23.0
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/sparc/sparc64/installcd-stage1.spec | 6 +--
.../sparc/sparc64/installcd-stage2-minimal.spec| 50 +++---
tools/catalyst-auto-sparc64.conf | 8 ++--
3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/releases/specs/sparc/sparc64/installcd-stage1.spec
b/releases/specs/sparc/sparc64/installcd-stage1.spec
index 07591873..00c7a9ee 100644
--- a/releases/specs/sparc/sparc64/installcd-stage1.spec
+++ b/releases/specs/sparc/sparc64/installcd-stage1.spec
@@ -1,10 +1,10 @@
subarch: sparc64
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: default
-profile: default/linux/sparc/17.0/64ul
+rel_type: 23.0-default
+profile: default/linux/sparc/23.0/64ul
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-sparc64-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-sparc64-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
index ad71d265..dcaf63dd 100644
--- a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
+++ b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
subarch: sparc64
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: default
-profile: default/linux/sparc/17.0/64ul
+rel_type: 23.0-default
+profile: default/linux/sparc/23.0/64ul
snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-sparc64-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-sparc64-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -75,10 +75,10 @@ livecd/empty:
/etc/rsync
/etc/runlevels/single
/etc/skel
- /lib/dev-state
- /lib/udev-state
- /lib64/dev-state
- /lib64/udev-state
+ /usr/lib/dev-state
+ /usr/lib/udev-state
+ /usr/lib64/dev-state
+ /usr/lib64/udev-state
/root/.ccache
/tmp
/usr/diet/include
@@ -165,17 +165,17 @@ livecd/rm:
/etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /lib*/*.a
- /lib*/*.la
- /lib*/cpp
+ /usr/lib*/*.a
+ /usr/lib*/*.la
+ /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
- /sbin/*.static
- /sbin/fsck.cramfs
- /sbin/fsck.minix
- /sbin/mkfs.bfs
- /sbin/mkfs.cramfs
- /sbin/mkfs.minix
+ /usr/bin/*.static
+ /usr/bin/fsck.cramfs
+ /usr/bin/fsck.minix
+ /usr/bin/mkfs.bfs
+ /usr/bin/mkfs.cramfs
+ /usr/bin/mkfs.minix
/usr/bin/addr2line
/usr/bin/ar
/usr/bin/as
@@ -221,15 +221,15 @@ livecd/rm:
/usr/lib*/*.la
/usr/lib*/perl5/site_perl
/usr/lib*/gcc-lib/*/*/libgcj*
- /usr/sbin/archive-conf
- /usr/sbin/dispatch-conf
- /usr/sbin/emaint
- /usr/sbin/env-update
- /usr/sbin/etc-update
- /usr/sbin/fb*
- /usr/sbin/fixpackages
- /usr/sbin/quickpkg
- /usr/sbin/regenworld
+ /usr/bin/archive-conf
+ /usr/bin/dispatch-conf
+ /usr/bin/emaint
+ /usr/bin/env-update
+ /usr/bin/etc-update
+ /usr/bin/fb*
+ /usr/bin/fixpackages
+ /usr/bin/quickpkg
+ /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index d094f457..3f797369 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -17,12 +17,12 @@ SETS="
SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
-SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec
sparc64/installcd-stage2-minimal.spec"
SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec
sparc/stage3-openrc-23.spec"
SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec
sparc/stage3-systemd-23.spec"
SET_openrc_64_23_SPECS="sparc64/stage1-openrc-23.spec
sparc64/stage3-openrc-23.spec"
+SET_openrc_64_23_OPTIONAL_SPECS="sparc64/installcd-stage1.spec
sparc64/installcd-stage2-minimal.spec"
SET_systemd_64_23_SPECS="sparc64/stage1-systemd-23.spec
sparc64/stage3-systemd-23.spec"
@@ -53,9 +53,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- sparc64/installcd-stage2-minimal.spec)
- upload *${TIMESTAMP}*.iso*
- ;;
sparc/stage3.spec)
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
commit: 71c15eec945ce183b2f7224ca937b480c666
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Apr 5 18:53:38 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Apr 5 18:53:38 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=71c15eec
Switch ppc64le boot media to 23.0
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/ppc/ppc64le/installcd-stage1.spec | 6 +--
.../ppc/ppc64le/installcd-stage2-minimal.spec | 50 +++---
tools/catalyst-auto-ppc64le.conf | 4 +-
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/releases/specs/ppc/ppc64le/installcd-stage1.spec
b/releases/specs/ppc/ppc64le/installcd-stage1.spec
index 68960307..a744cd0d 100644
--- a/releases/specs/ppc/ppc64le/installcd-stage1.spec
+++ b/releases/specs/ppc/ppc64le/installcd-stage1.spec
@@ -1,10 +1,10 @@
subarch: ppc64le
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: default
-profile: default/linux/ppc64le/17.0
+rel_type: 23.0-default
+profile: default/linux/ppc64le/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-ppc64le-openrc-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-ppc64le-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
index 133df307..adef9670 100644
--- a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
+++ b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
subarch: ppc64le
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: default
-profile: default/linux/ppc64le/17.0
+rel_type: 23.0-default
+profile: default/linux/ppc64le/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-ppc64le-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-ppc64le-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -84,10 +84,10 @@ livecd/empty:
/etc/rsync
/etc/runlevels/single
/etc/skel
- /lib/dev-state
- /lib/udev-state
- /lib64/dev-state
- /lib64/udev-state
+ /usr/lib/dev-state
+ /usr/lib/udev-state
+ /usr/lib64/dev-state
+ /usr/lib64/udev-state
/root/.ccache
/tmp
/usr/include
@@ -158,17 +158,17 @@ livecd/rm:
/etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /lib*/*.a
- /lib*/*.la
- /lib*/cpp
+ /usr/lib*/*.a
+ /usr/lib*/*.la
+ /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
- /sbin/*.static
- /sbin/fsck.cramfs
- /sbin/fsck.minix
- /sbin/mkfs.bfs
- /sbin/mkfs.cramfs
- /sbin/mkfs.minix
+ /usr/bin/*.static
+ /usr/bin/fsck.cramfs
+ /usr/bin/fsck.minix
+ /usr/bin/mkfs.bfs
+ /usr/bin/mkfs.cramfs
+ /usr/bin/mkfs.minix
/usr/bin/addr2line
/usr/bin/ar
/usr/bin/as
@@ -211,15 +211,15 @@ livecd/rm:
/usr/lib*/*.la
/usr/lib*/perl5/site_perl
/usr/lib*/gcc-lib/*/*/libgcj*
- /usr/sbin/archive-conf
- /usr/sbin/dispatch-conf
- /usr/sbin/emaint
- /usr/sbin/env-update
- /usr/sbin/etc-update
- /usr/sbin/fb*
- /usr/sbin/fixpackages
- /usr/sbin/quickpkg
- /usr/sbin/regenworld
+ /usr/bin/archive-conf
+ /usr/bin/dispatch-conf
+ /usr/bin/emaint
+ /usr/bin/env-update
+ /usr/bin/etc-update
+ /usr/bin/fb*
+ /usr/bin/fixpackages
+ /usr/bin/quickpkg
+ /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 75356aa0..aba6051a 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -19,7 +19,6 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec
stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
@@ -29,6 +28,7 @@
SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stag
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -68,7 +68,7 @@ post_build() {
case ${spec} in
installcd-stage2-minimal.spec)
- upload default/*${TIMESTAMP}*.iso*
+ upload 23.0-default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc32/
commit: 0e294a12b288ae57825c32384409bc2709718fdc Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Apr 5 18:21:07 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Apr 5 18:21:07 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=0e294a12 Switch ppc boot media to 23.0 Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/ppc/ppc32/installcd-stage1.spec | 6 +-- .../specs/ppc/ppc32/installcd-stage2-minimal.spec | 52 +++--- tools/catalyst-auto-ppc.conf | 9 ++-- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/releases/specs/ppc/ppc32/installcd-stage1.spec b/releases/specs/ppc/ppc32/installcd-stage1.spec index 223526a0..f032efc7 100644 --- a/releases/specs/ppc/ppc32/installcd-stage1.spec +++ b/releases/specs/ppc/ppc32/installcd-stage1.spec @@ -1,10 +1,10 @@ subarch: ppc target: livecd-stage1 version_stamp: @TIMESTAMP@ -rel_type: default -profile: default/linux/ppc/17.0 +rel_type: 23.0-default +profile: default/linux/ppc/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-ppc-openrc-@TIMESTAMP@ +source_subpath: 23.0-default/stage3-ppc-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos diff --git a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec index 2845f3da..9f8f591b 100644 --- a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec +++ b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec @@ -1,16 +1,16 @@ subarch: ppc target: livecd-stage2 version_stamp: @TIMESTAMP@ -rel_type: default -profile: default/linux/ppc/17.0 +rel_type: 23.0-default +profile: default/linux/ppc/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/livecd-stage1-ppc-@TIMESTAMP@ +source_subpath: 23.0-default/livecd-stage1-ppc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: scandelay=10 livecd/fstype: squashfs livecd/gk_mainargs: --makeopts=-j12 -livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-@TIMESTAMP@.iso +livecd/iso: /var/tmp/catalyst/builds/23.0-default/install-powerpc-minimal-@TIMESTAMP@.iso livecd/type: gentoo-release-minimal livecd/rcadd: pbbuttonsd|default @@ -121,10 +121,10 @@ livecd/empty: /etc/modules.autoload.d /etc/runlevels/single /etc/skel - /lib/dev-state - /lib/udev-state - /lib64/dev-state - /lib64/udev-state + /usr/lib/dev-state + /usr/lib/udev-state + /usr/lib64/dev-state + /usr/lib64/udev-state /root/.ccache /tmp /usr/diet/include @@ -199,17 +199,17 @@ livecd/rm: /etc/make.profile /etc/man.conf /etc/resolv.conf - /lib*/*.a - /lib*/*.la - /lib*/cpp + /usr/lib*/*.a + /usr/lib*/*.la + /usr/lib*/cpp /root/.bash_history /root/.viminfo - /sbin/*.static - /sbin/fsck.cramfs - /sbin/fsck.minix - /sbin/mkfs.bfs - /sbin/mkfs.cramfs - /sbin/mkfs.minix + /usr/bin/*.static + /usr/bin/fsck.cramfs + /usr/bin/fsck.minix + /usr/bin/mkfs.bfs + /usr/bin/mkfs.cramfs + /usr/bin/mkfs.minix /usr/bin/addr2line /usr/bin/ar /usr/bin/as @@ -253,15 +253,15 @@ livecd/rm: /usr/lib*/*.la /usr/lib*/perl5/site_perl /usr/lib*/gcc-lib/*/*/libgcj* - /usr/sbin/archive-conf - /usr/sbin/dispatch-conf - /usr/sbin/emaint - /usr/sbin/env-update - /usr/sbin/etc-update - /usr/sbin/fb* - /usr/sbin/fixpackages - /usr/sbin/quickpkg - /usr/sbin/regenworld + /usr/bin/archive-conf + /usr/bin/dispatch-conf + /usr/bin/emaint + /usr/bin/env-update + /usr/bin/etc-update + /usr/bin/fb* + /usr/bin/fixpackages + /usr/bin/quickpkg + /usr/bin/regenworld /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index 1e1556e8..1a195805 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -19,7 +19,6 @@ SETS=" " SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec" -SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec" SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec" @@ -28,6 +27,7 @@ SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec" SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec" SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec" +SET_openrc_23_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec" SET_systemd_23_SPECS="ppc32/stage1-systemd-
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ia64/
commit: 8ab9c340525b0049f233ab20b7980a8b7c1ad317 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Apr 4 18:51:44 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Apr 4 18:51:44 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=8ab9c340 Switch ia64 boot media to 23.0 Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/ia64/installcd-stage1.spec | 44 ++--- releases/specs/ia64/installcd-stage2-minimal.spec | 58 ++- tools/catalyst-auto-ia64.conf | 4 +- 3 files changed, 31 insertions(+), 75 deletions(-) diff --git a/releases/specs/ia64/installcd-stage1.spec b/releases/specs/ia64/installcd-stage1.spec index 18c9b89e..863153d3 100644 --- a/releases/specs/ia64/installcd-stage1.spec +++ b/releases/specs/ia64/installcd-stage1.spec @@ -1,10 +1,10 @@ subarch: ia64 version_stamp: @TIMESTAMP@ target: livecd-stage1 -rel_type: default -profile: default/linux/ia64/17.0 +rel_type: 23.0-default +profile: default/linux/ia64/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-ia64-openrc-@TIMESTAMP@ +source_subpath: 23.0-default/stage3-ia64-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos @@ -17,23 +17,16 @@ livecd/use: xml livecd/packages: -# app-admin/hddtemp app-admin/pwgen app-admin/syslog-ng app-arch/unzip app-crypt/gnupg -# Not keyworded -# app-editors/mg app-misc/livecd-tools app-misc/screen app-portage/mirrorselect app-text/wgetpaste -# media-gfx/fbgrab net-analyzer/traceroute net-dialup/mingetty -# net-dialup/penggy -# net-dialup/pptpclient -# net-dialup/rp-pppoe net-fs/cifs-utils net-fs/nfs-utils net-irc/irssi @@ -41,50 +34,19 @@ livecd/packages: net-misc/dhcpcd net-misc/iputils net-misc/rdate -# net-misc/vconfig net-proxy/dante -# Not keyworded -# net-proxy/tsocks -# net-wireless/ipw2100-firmware -# net-wireless/ipw2200-firmware -# net-wireless/prism54-firmware -# net-wireless/wireless-tools -# net-wireless/wpa_supplicant -# net-wireless/zd1201-firmware sys-apps/busybox sys-apps/ethtool sys-apps/fxload sys-apps/hdparm sys-apps/iproute2 -# sys-apps/lssbus -# sys-apps/memtester -# sys-apps/netplug -# sys-apps/powerpc-utils -# sys-apps/ibm-powerpc-utils -# sys-apps/ibm-powerpc-utils-papr sys-apps/sdparm sys-block/parted -# sys-block/partimage -# sys-block/qla-fc-firmware -# sys-boot/yaboot -# sys-devel/binutils-hppa64 -# sys-devel/gcc-hppa64 sys-fs/cryptsetup -# sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs -# sys-fs/hfsplusutils -# sys-fs/hfsutils -# sys-fs/iprutils sys-fs/jfsutils -# sys-fs/lsscsi -# sys-fs/lvm2 -# sys-fs/lvm-user -# sys-fs/mac-fdisk sys-fs/mdadm -# sys-fs/multipath-tools -# Not keyworded -# sys-fs/ntfsprogs sys-fs/reiserfsprogs sys-fs/xfsprogs sys-libs/gpm diff --git a/releases/specs/ia64/installcd-stage2-minimal.spec b/releases/specs/ia64/installcd-stage2-minimal.spec index 140e31cb..4cc4d5fe 100644 --- a/releases/specs/ia64/installcd-stage2-minimal.spec +++ b/releases/specs/ia64/installcd-stage2-minimal.spec @@ -1,15 +1,15 @@ subarch: ia64 version_stamp: @TIMESTAMP@ target: livecd-stage2 -rel_type: default -profile: default/linux/ia64/17.0 +rel_type: 23.0-default +profile: default/linux/ia64/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/livecd-stage1-ia64-@TIMESTAMP@ +source_subpath: 23.0-default/livecd-stage1-ia64-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: dokeymap livecd/fstype: squashfs -livecd/iso: /home/catalyst/builds/default/install-ia64-minimal-@TIMESTAMP@.iso +livecd/iso: /home/catalyst/builds/23.0-default/install-ia64-minimal-@TIMESTAMP@.iso livecd/type: gentoo-release-minimal livecd/volid: Gentoo ia64 @TIMESTAMP@ livecd/gk_mainargs: --no-lvm --no-dmraid --no-luks @@ -29,9 +29,6 @@ boot/kernel/gentoo/use: unicode usb -#boot/kernel/gentoo/packages: -# sys-fs/ntfs3g - livecd/unmerge: app-admin/eselect app-admin/eselect-ctags @@ -42,11 +39,9 @@ livecd/unmerge: dev-libs/gmp dev-libs/libxml2 dev-libs/mpfr -# dev-libs/popt dev-python/pycrypto dev-util/pkgconfig dev-util/pkgconf -# net-misc/rsync perl-core/PodParser perl-core/Test-Harness sys-apps/debianutils @@ -87,13 +82,12 @@ livecd/empty: /etc/cron.weekly /etc/logrotate.d /etc/modules.autoload.d -# /etc/rsync /etc/runlevels/single /etc/skel - /lib/dev-state -
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/hppa/
commit: ece1c61bb0a34645a148f4bc3d4fa7f7aca3676f Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Apr 4 18:41:51 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Apr 4 18:42:16 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=ece1c61b Switch hppa boot media to 23.0 Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/hppa/installcd-stage1.spec | 8 +- releases/specs/hppa/installcd-stage2-minimal.spec | 56 releases/specs/hppa/netboot-hppa32.spec | 106 +++ releases/specs/hppa/netboot-hppa64.spec | 156 +++--- tools/catalyst-auto-hppa.conf | 30 ++--- 5 files changed, 178 insertions(+), 178 deletions(-) diff --git a/releases/specs/hppa/installcd-stage1.spec b/releases/specs/hppa/installcd-stage1.spec index 4ab84f4e..57b1a6cd 100644 --- a/releases/specs/hppa/installcd-stage1.spec +++ b/releases/specs/hppa/installcd-stage1.spec @@ -1,11 +1,11 @@ subarch: hppa1.1 version_stamp: @TIMESTAMP@ target: livecd-stage1 -rel_type: default -profile: default/linux/hppa/17.0 +rel_type: 23.0-default +profile: default/linux/hppa/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-hppa1.1-openrc-@TIMESTAMP@ -pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage1 +source_subpath: 23.0-default/stage3-hppa1.1-openrc-@TIMESTAMP@ +pkgcache_path: /var/tmp/catalyst/packages/23.0-default/installcd-stage1 portage_confdir: @REPO_DIR@/releases/portage/isos livecd/use: compile-locales diff --git a/releases/specs/hppa/installcd-stage2-minimal.spec b/releases/specs/hppa/installcd-stage2-minimal.spec index 2fb7ffa9..e56496da 100644 --- a/releases/specs/hppa/installcd-stage2-minimal.spec +++ b/releases/specs/hppa/installcd-stage2-minimal.spec @@ -1,17 +1,17 @@ subarch: hppa1.1 version_stamp: @TIMESTAMP@ target: livecd-stage2 -rel_type: default -profile: default/linux/hppa/17.0 +rel_type: 23.0-default +profile: default/linux/hppa/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/livecd-stage1-hppa1.1-@TIMESTAMP@ -pkgcache_path: /var/tmp/catalyst/packages/default/installcd-stage2 +source_subpath: 23.0-default/livecd-stage1-hppa1.1-@TIMESTAMP@ +pkgcache_path: /var/tmp/catalyst/packages/23.0-default/installcd-stage2 portage_confdir: @REPO_DIR@/releases/portage/isos livecd/volid: Gentoo hppa @TIMESTAMP@ livecd/bootargs: dokeymap livecd/fstype: squashfs -livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-minimal-@TIMESTAMP@.iso +livecd/iso: /var/tmp/catalyst/builds/23.0-default/install-hppa-minimal-@TIMESTAMP@.iso livecd/type: gentoo-release-minimal boot/kernel: hppa32 hppa64 @@ -125,7 +125,7 @@ livecd/unmerge: sys-libs/db sys-libs/gdbm sys-libs/cracklib - x11-misc/shared-mime-info + x11-misc/shared-mime-info livecd/empty: /boot @@ -138,10 +138,10 @@ livecd/empty: /etc/rsync /etc/runlevels/single /etc/skel - /lib/dev-state - /lib/udev-state - /lib64/dev-state - /lib64/udev-state + /usr/lib/dev-state + /usr/lib/udev-state + /usr/lib64/dev-state + /usr/lib64/udev-state /root/.ccache /tmp /usr/diet/include @@ -226,17 +226,17 @@ livecd/rm: /etc/make.profile /etc/man.conf /etc/resolv.conf - /lib*/*.a - /lib*/*.la - /lib*/cpp + /usr/lib*/*.a + /usr/lib*/*.la + /usr/lib*/cpp /root/.bash_history /root/.viminfo - /sbin/*.static - /sbin/fsck.cramfs - /sbin/fsck.minix - /sbin/mkfs.bfs - /sbin/mkfs.cramfs - /sbin/mkfs.minix + /usr/bin/*.static + /usr/bin/fsck.cramfs + /usr/bin/fsck.minix + /usr/bin/mkfs.bfs + /usr/bin/mkfs.cramfs + /usr/bin/mkfs.minix /usr/bin/addr2line /usr/bin/ar /usr/bin/as @@ -285,15 +285,15 @@ livecd/rm: /usr/lib*/*.la /usr/lib*/perl5/site_perl /usr/lib*/gcc-lib/*/*/libgcj* - /usr/sbin/archive-conf - /usr/sbin/dispatch-conf - /usr/sbin/emaint - /usr/sbin/env-update - /usr/sbin/etc-update - /usr/sbin/fb* - /usr/sbin/fixpackages - /usr/sbin/quickpkg - /usr/sbin/regenworld + /usr/bin/archive-conf + /usr/bin/dispatch-conf + /usr/bin/emaint + /usr/bin/env-update + /usr/bin/etc-update + /usr/bin/fb* + /usr/bin/fixpackages + /usr/bin/quickpkg + /usr/bin/regenworld /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* diff --git a/releases/specs/hppa/netboot-hppa32.spec b/releases/specs/hppa/netboot-hppa32.spec index 7662d47c..24658ef2 100644 --- a/releases/specs/hppa/netboot-hppa32.spec +++ b/releases/specs/hppa/netboot-hppa32.spec @@ -1,14 +1,14 @@ # HPPA Netboot spec file by Guy Martin version_stamp: @TI
[gentoo-commits] proj/releng:master commit in: tools/
commit: e86116180e075f161fff1cc5b11ecd377137968a
Author: Ben Kohler gentoo org>
AuthorDate: Tue Apr 2 11:52:05 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Apr 2 11:53:43 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=e8611618
catalyst-auto: extra echo to debug CLST_AUTO_NOCLEAN
Signed-off-by: Ben Kohler gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 9624cebb..04db65e7 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -544,6 +544,7 @@ run_catalyst_commands() {
specpath=$(readlink -f "${i}")
# Bail out of cleaning (eg) stage3-openrc.spec failure
if
# CLST_AUTO_NOCLEAN="stage3-openrc.spec" is set
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" echo "Testing
${i} against CLST_AUTO_NOCLEAN=${CLST_AUTO_NOCLEAN}"
[[ ${CLST_AUTO_NOCLEAN} == *${i}* ]] ||
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst
--purgetmponly -c "${CATALYST_CONFIG}" -f "${specpath}"
done
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/alpha/
commit: 217d000b5327fd60b7eed715e73a9b6b6677ed15
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Apr 1 19:06:18 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Apr 1 19:06:18 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=217d000b
Convert alpha iso to 23.0
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs-qemu/alpha/installcd-stage1.spec| 6 +--
.../specs-qemu/alpha/installcd-stage2-minimal.spec | 52 +++---
tools/catalyst-auto-qemu-alpha.conf| 8 ++--
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/releases/specs-qemu/alpha/installcd-stage1.spec
b/releases/specs-qemu/alpha/installcd-stage1.spec
index 6d7fa9be..c8300a93 100644
--- a/releases/specs-qemu/alpha/installcd-stage1.spec
+++ b/releases/specs-qemu/alpha/installcd-stage1.spec
@@ -1,10 +1,10 @@
subarch: alpha
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: default
-profile: default/linux/alpha/17.0
+rel_type: 23.0-default
+profile: default/linux/alpha/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-alpha-openrc-@TIMESTAMP@
+source_subpath: 23.0-default/stage3-alpha-openrc-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos-qemu
interpreter: /usr/bin/qemu-alpha
compression_mode: pixz
diff --git a/releases/specs-qemu/alpha/installcd-stage2-minimal.spec
b/releases/specs-qemu/alpha/installcd-stage2-minimal.spec
index f9cbde4d..e0437a95 100644
--- a/releases/specs-qemu/alpha/installcd-stage2-minimal.spec
+++ b/releases/specs-qemu/alpha/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
subarch: alpha
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: default
-profile: default/linux/alpha/17.0
+rel_type: 23.0-default
+profile: default/linux/alpha/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-alpha-@TIMESTAMP@
+source_subpath: 23.0-default/livecd-stage1-alpha-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos-qemu
interpreter: /usr/bin/qemu-alpha
@@ -12,7 +12,7 @@ livecd/bootargs: dokeymap
livecd/cdtar:
/usr/share/catalyst/livecd/cdtar/aboot-1.0_pre20040408-r2-cdtar.tar.bz2
livecd/fsscript: /root/releng/releases/scripts/livecd.sh
livecd/fstype: squashfs
-livecd/iso:
/var/tmp/catalyst/builds/default/install-alpha-minimal-@TIMESTAMP@.iso
+livecd/iso:
/var/tmp/catalyst/builds/23.0-default/install-alpha-minimal-@TIMESTAMP@.iso
livecd/type: gentoo-release-minimal
livecd/volid: Gentoo alpha @TIMESTAMP@
livecd/gk_mainargs: --firmware-files=qlogic/1040.bin
@@ -105,10 +105,10 @@ livecd/empty:
# /etc/rsync
/etc/runlevels/single
/etc/skel
- /lib/dev-state
- /lib/udev-state
- /lib64/dev-state
- /lib64/udev-state
+ /usr/lib/dev-state
+ /usr/lib/udev-state
+ /usr/lib64/dev-state
+ /usr/lib64/udev-state
/root/.ccache
/tmp
/usr/diet/include
@@ -196,17 +196,17 @@ livecd/rm:
/etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /lib*/*.a
- /lib*/*.la
- /lib*/cpp
+ /usr/lib*/*.a
+ /usr/lib*/*.la
+ /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
- /sbin/*.static
- /sbin/fsck.cramfs
- /sbin/fsck.minix
- /sbin/mkfs.bfs
- /sbin/mkfs.cramfs
- /sbin/mkfs.minix
+ /usr/bin/*.static
+ /usr/bin/fsck.cramfs
+ /usr/bin/fsck.minix
+ /usr/bin/mkfs.bfs
+ /usr/bin/mkfs.cramfs
+ /usr/bin/mkfs.minix
/usr/bin/addr2line
/usr/bin/ar
/usr/bin/as
@@ -255,15 +255,15 @@ livecd/rm:
/usr/lib*/*.la
/usr/lib*/perl5/site_perl
/usr/lib*/gcc-lib/*/*/libgcj*
- /usr/sbin/archive-conf
- /usr/sbin/dispatch-conf
- /usr/sbin/emaint
- /usr/sbin/env-update
- /usr/sbin/etc-update
- /usr/sbin/fb*
- /usr/sbin/fixpackages
- /usr/sbin/quickpkg
- /usr/sbin/regenworld
+ /usr/bin/archive-conf
+ /usr/bin/dispatch-conf
+ /usr/bin/emaint
+ /usr/bin/env-update
+ /usr/bin/etc-update
+ /usr/bin/fb*
+ /usr/bin/fixpackages
+ /usr/bin/quickpkg
+ /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*
diff --git a/tools/catalyst-auto-qemu-alpha.conf
b/tools/catalyst-auto-qemu-alpha.conf
index 62a52805..d62670b1 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -13,9 +13,9 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alph
[gentoo-commits] proj/releng:master commit in: tools/
commit: 3a1a13decdb951cb5472d90736af8fce394f5e41
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Mar 31 12:04:44 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Mar 31 12:04:44 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a1a13de
Switch amd64 bootmedia uploads to 23.0
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5d45b13f..933b04df 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
+ livegui_23
openrc_23_su
systemd_23
nomultilib_openrc_23
@@ -27,7 +28,6 @@ SETS="
x32_openrc_23
x32_systemd_23
openrc
- livegui
nomultilib_openrc
llvm_openrc
hardened_openrc
@@ -43,12 +43,9 @@ SETS="
# 17.0
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec
installcd-stage2-minimal.spec"
-
-SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec
livegui/livegui-stage2.spec"
+SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
-SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec"
SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec
hardened-selinux/stage3-openrc.spec"
@@ -71,7 +68,9 @@ SET_x32_openrc_SPECS="x32/stage1-openrc.spec
x32/stage3-openrc.spec"
# 23.0
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
-SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec installcd-stage1.spec
installcd-stage2-minimal.spec"
+
+SET_livegui_23_OPTIONAL_SPECS="livegui/livegui-stage1.spec
livegui/livegui-stage2.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
@@ -79,6 +78,7 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec
stage3-systemd-23.spec"
SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec"
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
+SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec"
SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec
hardened/stage3-systemd-23.spec"
@@ -137,15 +137,9 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
case ${spec} in
- installcd-stage2-minimal.spec)
- upload install-amd64-minimal-${TIMESTAMP}.iso*
- ;;
x32/stage3-openrc.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
;;
- livegui/livegui-stage2.spec)
- upload livegui-amd64-${TIMESTAMP}.iso*
- ;;
esac
popd >/dev/null || exit
@@ -167,6 +161,12 @@ post_build() {
upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
;;
+ installcd-stage2-minimal.spec)
+ upload install-amd64-minimal-${TIMESTAMP}.iso*
+ ;;
+ livegui/livegui-stage2.spec)
+ upload livegui-amd64-${TIMESTAMP}.iso*
+ ;;
nomultilib/stage3-openrc-23.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
@@ -217,9 +217,6 @@ post_build() {
hardened/stage3-openrc.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
;;
- hardened/admincd-stage2.spec)
- upload admincd-amd64-${TIMESTAMP}.iso*
- ;;
esac
popd >/dev/null || exit
@@ -232,6 +229,9 @@ post_build() {
upload stage3-amd64-hardened-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64"
amd64/23.0/x86-64_hardened
;;
+ hardened/admincd-stage2.spec)
+ upload admincd-amd64-${TIMESTAMP}.iso*
+ ;;
hardened-nomultilib/stage3-openrc-23.spec)
upload
stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: ff7b354f5ed617aa0ea04bbfde7de66b64efd51d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Mar 28 00:03:11 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Mar 28 00:03:33 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=ff7b354f
Drop unused config file
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-s390.conf | 67 ---
1 file changed, 67 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
deleted file mode 100644
index 8b9f1b3b..
--- a/tools/catalyst-auto-s390.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=s390
-UPLOAD_KEY=/root/.ssh/id_rsa
-SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
-SUBARCH=s390
-
-SETS="
- openrc_23
- systemd_23
- openrc
-"
-
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-
-SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
-
-SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
-
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- local d f
- for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
- mkdir -p "${d}"
- pushd "${d}" >/dev/null
- for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest |
give_latest_from_dates) ; do
- local of=$(echo "${f}" | convert_filename)
- ln -sf "${f}" "${of}"
- done
- popd >/dev/null
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- netboot/netboot.spec)
- ls -l netboot-s390-${TIMESTAMP}/kernels/
- mv -v netboot-s390-${TIMESTAMP}/kernels/netboot
netboot-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
- mv -v netboot-s390-${TIMESTAMP}/kernels/misc/netboot.igz
netboot-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
- upload netboot-s390-${TIMESTAMP}/netboot*
- ;;
- stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
- ;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
- case ${spec} in
- stage3-openrc-23.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd-23.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
- ;;
- esac
- popd >/dev/null
-}
[gentoo-commits] proj/releng:master commit in: tools/
commit: 9b41e1a51292a264959347d35ec1b35f7b1dd03f
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Mar 27 13:25:06 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Mar 27 13:25:06 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=9b41e1a5
Integrate 32bit stuff into s390x builder
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-s390x.conf | 30 --
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 355c7d82..dc4104de 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -4,12 +4,14 @@
UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390
-SUBARCH=s390x
SETS="
openrc_64_23
systemd_64_23
+ openrc_32_23
+ systemd_32_23
openrc_64
+ openrc_32
"
SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
@@ -19,16 +21,24 @@ SET_openrc_64_23_SPECS="s390x/stage1-openrc-23.spec
s390x/stage3-openrc-23.spec"
SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec
s390x/stage3-systemd-23.spec"
+SET_openrc_32_SPECS="s390/stage1-openrc.spec s390/stage3-openrc.spec"
+SET_openrc_32_OPTIONAL_SPECS="s390/netboot/netboot.spec"
+
+SET_openrc_32_23_SPECS="s390/stage1-openrc-23.spec s390/stage3-openrc-23.spec"
+
+SET_systemd_32_23_SPECS="s390/stage1-systemd-23.spec
s390/stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
- for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest |
give_latest_from_dates) ; do
+ for f in $(ls stage3-s390*xz | grep -v latest |
give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -47,9 +57,18 @@ post_build() {
mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz
netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot-s390x-${TIMESTAMP}/netboot*
;;
+ s390/netboot/netboot.spec)
+ ls -l netboot-s390-${TIMESTAMP}/kernels/
+ mv -v netboot-s390-${TIMESTAMP}/kernels/netboot
netboot-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
+ mv -v netboot-s390-${TIMESTAMP}/kernels/misc/netboot.igz
netboot-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
+ upload netboot-s390-${TIMESTAMP}/netboot*
+ ;;
s390x/stage3-openrc.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
+ s390/stage3-openrc.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
+ ;;
esac
popd >/dev/null
@@ -62,6 +81,13 @@ post_build() {
upload stage3-s390x-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
;;
+ s390/stage3-openrc-23.spec)
+ upload stage3-s390-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ s390/stage3-systemd-23.spec)
+ upload stage3-s390-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
+ ;;
esac
popd >/dev/null
}
[gentoo-commits] proj/releng:master commit in: tools/
commit: acbca0b011faf04a83c7e9e7d09a977ff2804586
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Mar 27 13:10:52 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Mar 27 13:10:52 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=acbca0b0
Mark s390x specs as such, prepare for 32bit addition
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-s390x.conf | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 3bc474b9..355c7d82 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -3,21 +3,21 @@
UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
-SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
+SPECS_DIR=${REPO_DIR}/releases/specs/s390
SUBARCH=s390x
SETS="
- openrc_23
- systemd_23
- openrc
+ openrc_64_23
+ systemd_64_23
+ openrc_64
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
+SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
+SET_openrc_64_OPTIONAL_SPECS="s390x/netboot/netboot.spec"
-SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_64_23_SPECS="s390x/stage1-openrc-23.spec
s390x/stage3-openrc-23.spec"
-SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec
s390x/stage3-systemd-23.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@@ -41,13 +41,13 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- netboot/netboot.spec)
+ s390x/netboot/netboot.spec)
ls -l netboot-s390x-${TIMESTAMP}/
mv -v netboot-s390x-${TIMESTAMP}/kernels/netboot64
netboot-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz
netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot-s390x-${TIMESTAMP}/netboot*
;;
- stage3-openrc.spec)
+ s390x/stage3-openrc.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
esac
@@ -55,11 +55,11 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
- stage3-openrc-23.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+ s390x/stage3-openrc-23.spec)
+ upload stage3-s390x-openrc-${TIMESTAMP}.tar.xz*
;;
- stage3-systemd-23.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
+ s390x/stage3-systemd-23.spec)
+ upload stage3-s390x-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 5e3b3b971f7442c6b226b6ae9bc41a4f09fde8f4
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 14:21:03 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 14:21:03 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=5e3b3b97
Upload 23.0 stages for x86
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-x86.conf | 31 ++-
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 279d5e83..fd16762a 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -17,9 +17,7 @@ SETS="
hardened_openrc_23
musl_23
i486_openrc
- i486_systemd_mu
i686_openrc
- i686_systemd_mu
hardened_openrc
musl
"
@@ -29,16 +27,12 @@
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd
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"
@@ -84,14 +78,12 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
case ${spec} in
i486/stage3-openrc.spec)
- upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
;;
i486/installcd-stage2-minimal-openrc.spec)
upload install-x86-minimal-${TIMESTAMP}.iso*
;;
i686/stage3-openrc.spec)
- upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
;;
esac
@@ -99,30 +91,26 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-default >/dev/null || exit
case ${spec} in
+ i486/stage3-openrc-23.spec)
+ upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
+ ;;
i486/stage3-systemd-23.spec)
+ upload stage3-i486-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i486" x86/23.0/i486
;;
+ i686/stage3-openrc-23.spec)
+ upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
+ ;;
i686/stage3-systemd-23.spec)
+ upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
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)
- upload stage3-i486-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- i686/stage3-systemd-mu.spec)
- upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc.spec)
- upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/hardened/stage3-i686" x86/17.0/i686_hardened
;;
hardened/admincd-stage2-openrc.spec)
@@ -134,6 +122,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
+ upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-i686" x86/23.0/i686_hardened
;;
esac
@@ -142,7 +131,6 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)
- upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-i686" x86/17.0/i686_musl
;;
esac
@@ -151,6 +139,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
+ upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
upsync_
[gentoo-commits] proj/releng:master commit in: tools/
commit: 73b527f09bc993037cae0b480e8a19a78dfeda7d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 14:16:15 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 14:16:15 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=73b527f0
Upload 23.0 stages for sparc
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-sparc64.conf | 25 -
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 34b7553d..d094f457 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -11,17 +11,13 @@ SETS="
openrc_64_23
systemd_64_23
openrc_32
- systemd_32_mu
openrc_64
- systemd_64_mu
"
SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
-SET_systemd_32_mu_SPECS="sparc/systemd-stage1-mu.spec
sparc/systemd-stage3-mu.spec"
SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec
sparc64/installcd-stage2-minimal.spec"
-SET_systemd_64_mu_SPECS="sparc64/systemd-stage1-mu.spec
sparc64/systemd-stage3-mu.spec"
SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec
sparc/stage3-openrc-23.spec"
SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec
sparc/stage3-systemd-23.spec"
@@ -61,11 +57,9 @@ post_build() {
upload *${TIMESTAMP}*.iso*
;;
sparc/stage3.spec)
- upload stage3-sparc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
;;
sparc64/stage3.spec)
- upload stage3-sparc64-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
;;
esac
@@ -73,23 +67,20 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ sparc/stage3-openrc-23.spec)
+ upload stage3-sparc-openrc-${TIMESTAMP}*.xz*
+ ;;
sparc/stage3-systemd-23.spec)
+ upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc" sparc/23.0/32
;;
+ sparc64/stage3-openrc-23.spec)
+ upload stage3-sparc64-openrc-${TIMESTAMP}*.xz*
+ ;;
sparc64/stage3-systemd-23.spec)
+ upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64
;;
esac
popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- sparc/systemd-stage3-mu.spec)
- upload stage3-sparc-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- sparc64/systemd-stage3-mu.spec)
- upload stage3-sparc64-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- esac
- popd >/dev/null
}
[gentoo-commits] proj/releng:master commit in: tools/
commit: b0e6c0a4f1193bf4160f96b48db62ae74fd855af
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 14:11:06 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 14:11:06 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=b0e6c0a4
Upload 23.0 stages for s390
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-s390.conf | 16
tools/catalyst-auto-s390x.conf | 16
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index e442ccac..8b9f1b3b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -10,14 +10,11 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -51,23 +48,18 @@ post_build() {
upload netboot-s390-${TIMESTAMP}/netboot*
;;
stage3-openrc.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
;;
esac
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 99c5c3ef..3bc474b9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -10,14 +10,11 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -51,7 +48,6 @@ post_build() {
upload netboot-s390x-${TIMESTAMP}/netboot*
;;
stage3-openrc.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
esac
@@ -59,17 +55,13 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
;;
esac
popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
}
[gentoo-commits] proj/releng:master commit in: tools/
commit: f5f9577240a4cc84d5bb8c5d50d39a94be3a6987
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 13:01:30 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 13:01:30 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5f95772
Upload 23.0 stages for riscv
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 67 +++--
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index 46cdbddb..328b500a 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -20,25 +20,19 @@ SETS="
multilib_openrc_23
multilib_systemd_23
lp64d_openrc
- lp64d_systemd_mu
lp64d_musl
lp64_openrc
- lp64_systemd_mu
lp64_musl
multilib_openrc
- multilib_systemd_mu
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
-SET_lp64d_systemd_mu_SPECS="stage1-lp64d-systemd-mu.spec
stage3-lp64d-systemd-mu.spec"
SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
-SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec
stage3-lp64-systemd-mu.spec"
SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec
stage3-multilib-openrc.spec"
-SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec
stage3-multilib-systemd-mu.spec"
SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec"
SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec
stage3-lp64d-openrc-23.spec"
@@ -68,42 +62,49 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
+ pushd "${BUILD_SRCDIR_BASE}" >/dev/null
case ${spec} in
- stage3*systemd-23.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64d"
riscv/23.0/rv64_lp64d
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64"
riscv/23.0/rv64_lp64
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_multilib"
riscv/23.0/rv64_multilib
- popd >/dev/null
+ stage3-lp64d-openrc-23.spec)
+ upload
builds/23.0-default/stage3-rv64_lp64d-openrc-${TIMESTAMP}*.xz*
;;
- stage3*musl-23.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64d_musl"
riscv/23.0/rv64_lp64d_musl
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64_musl"
riscv/23.0/rv64_lp64_musl
- popd >/dev/null
+ stage3-lp64d-systemd-23.spec)
+ upload
builds/23.0-default/stage3-rv64_lp64d-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages
packages/23.0-default/stage3-rv64_lp64d riscv/23.0/rv64_lp64d
;;
- stage3*openrc.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e
's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_multilib"
riscv/20.0/rv64_multilib
- popd >/dev/null
+ stage3-lp64-openrc-23.spec)
+ upload
builds/23.0-default/stage3-rv64_lp64-openrc-${TIMESTAMP}*.xz*
+ ;;
+ stage3-lp64-systemd-23.spec)
+ upload
builds/23.0-default/stage3-rv64_lp64-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages
packages/23.0-default/stage3-rv64_lp64 riscv/23.0/rv64_lp64
+ ;;
+ stage3-multilib-openrc-23.spec)
+ upload
builds/23.0-default/stage3-rv64_multilib-openrc-${TIMESTAMP}*.xz*
+ ;;
+ stage3-multilib-systemd-23.spec)
+ upload
builds/23.0-default/stage3-rv64_multilib-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages
packages/23.0-default/stage3-rv64_multilib riscv/23.0/rv64_multilib
;;
- stage3*systemd-mu.spec)
- p
[gentoo-commits] proj/releng:master commit in: tools/
commit: 2c33f8d4f4f6f9521874707db47762ac008793f9
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 10:58:58 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 10:58:58 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=2c33f8d4
Upload 23.0 stages for ppc64 (LE)
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ppc64le.conf | 35 +--
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 8aa1e38c..75356aa0 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -13,9 +13,7 @@ SETS="
musl_hardened_23
musl_hardened_power9le_23
openrc
- systemd_mu
openrc_power9le
- systemd_power9le_mu
musl_hardened
musl_hardened_power9le
"
@@ -23,12 +21,8 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec
installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec
stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
-SET_systemd_power9le_mu_SPECS="stage1-systemd-mu-power9le.spec
stage3-systemd-mu-power9le.spec stage3d-systemd-mu-power9le.spec"
-
SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec
stage3-musl-hardened-openrc.spec"
SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec
stage3-musl-hardened-openrc-power9le.spec"
@@ -77,43 +71,40 @@ post_build() {
upload default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
;;
- stage3-systemd-mu.spec)
- upload
mergedusr/stage3-ppc64le-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
stage3-openrc-power9le.spec)
- upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/power9le/stage3-power9le" ppc/17.0/power9le
;;
- stage3d-openrc-power9le.spec)
- upload power9le/stage3-power9le-desktop-openrc-${TIMESTAMP}*.xz*
- ;;
- stage3-systemd-mu-power9le.spec)
- upload
power9le-mergedusr/stage3-power9le-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- stage3d-systemd-mu-power9le.spec)
- upload
power9le-mergedusr/stage3-power9le-desktop-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
stage3-musl-hardened-openrc.spec)
- upload
musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64le"
ppc/17.0/ppc64le_musl_hardened
;;
stage3-musl-hardened-openrc-power9le.spec)
- upload
power9le-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le"
ppc/17.0/power9le_musl_hardened
;;
+ stage3-openrc-23.spec)
+ upload 23.0-default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
+ ;;
stage3-systemd-23.spec)
+ upload 23.0-default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64le" ppc/23.0/ppc64le
;;
+ stage3-openrc-power9le-23.spec)
+ upload 23.0-default/stage3-power9le-openrc-${TIMESTAMP}*.xz*
+ ;;
+ stage3d-openrc-power9le-23.spec)
+ upload
23.0-default/stage3-power9le-desktop-openrc-${TIMESTAMP}*.xz*
+ ;;
stage3-systemd-power9le-23.spec)
+ upload 23.0-default/stage3-power9le-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-power9le" ppc/23.0/power9le
;;
stage3-musl-hardened-openrc-23.spec)
+ upload
23.0-musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64le"
ppc/23.0/ppc64le_musl_hardened
;;
stage3-musl-hardened-openrc-power9le-23.spec)
+ upload
23.0-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-power9le"
ppc/23.0/power9le_musl_hardened
;;
*)
[gentoo-commits] proj/releng:master commit in: tools/
commit: 819fbf8a8a773d7018a995f6b92a751b3691a16f
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 10:22:57 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 10:22:57 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=819fbf8a
Upload 23.0 stages for ppc and (BE) ppc64
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ppc.conf | 27 +++
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 4b5c5a43..1e1556e8 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -13,24 +13,18 @@ SETS="
systemd_64_23
musl_hardened_64_23
openrc
- systemd_mu
musl_hardened
openrc_64
- systemd_mu_64
musl_hardened_64
"
SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec
ppc32/installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="ppc32/stage1-systemd-mu.spec
ppc32/stage3-systemd-mu.spec"
-
SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec
ppc32/stage3-musl-hardened-openrc.spec"
SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
-SET_systemd_mu_64_SPECS="ppc64/stage1-systemd-mu.spec
ppc64/stage3-systemd-mu.spec"
-
SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec
ppc64/stage3-musl-hardened-openrc.spec"
SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
@@ -78,37 +72,38 @@ post_build() {
upload default/*${TIMESTAMP}*.iso*
;;
ppc32/stage3-openrc.spec)
- upload default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc" ppc/17.0/ppc
;;
- ppc32/stage3-systemd-mu.spec)
- upload mergedusr/stage3-ppc-systemd-mergedusr-*${TIMESTAMP}*.xz*
- ;;
ppc32/stage3-musl-hardened-openrc.spec)
- upload
musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc"
ppc/17.0/ppc_musl_hardened
;;
ppc64/stage3-openrc.spec)
- upload default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64" ppc/17.0/ppc64
;;
- ppc64/stage3-systemd-mu.spec)
- upload
mergedusr/stage3-ppc64-systemd-mergedusr-*${TIMESTAMP}*.xz*
- ;;
ppc64/stage3-musl-hardened-openrc.spec)
- upload
musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64"
ppc/17.0/ppc64_musl_hardened
;;
+
+ ppc32/stage3-openrc-23.spec)
+ upload 23.0-default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
+ ;;
ppc32/stage3-systemd-23.spec)
+ upload 23.0-default/stage3-ppc-systemd-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc
;;
ppc32/stage3-musl-hardened-openrc-23.spec)
+ upload
23.0-musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc"
ppc/23.0/ppc_musl_hardened
;;
+ ppc64/stage3-openrc-23.spec)
+ upload 23.0-default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
+ ;;
ppc64/stage3-systemd-23.spec)
+ upload 23.0-default/stage3-ppc64-systemd-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64
;;
ppc64/stage3-musl-hardened-openrc-23.spec)
+ upload
23.0-musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64"
ppc/23.0/ppc64_musl_hardened
;;
*)
[gentoo-commits] proj/releng:master commit in: tools/
commit: 45c841bdd486b9a9f90d2af0963799d38568b176
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 10:08:20 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 10:08:20 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=45c841bd
Upload 23.0 stages for mips
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-common | 112 +--
1 file changed, 42 insertions(+), 70 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 96bd8b20..238bd89e 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -8,14 +8,10 @@ EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
SETS_O32_17="
mipsel2_softfloat_o32_openrc
- mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
- mipsel2_o32_systemd_mu
mipsel2_o32_musl
mips2_softfloat_o32_openrc
- mips2_softfloat_o32_systemd_mu
mips2_o32_openrc
- mips2_o32_systemd_mu
mips2_o32_musl
"
@@ -36,9 +32,7 @@ SETS_O32="${SETS_O32_17} ${SETS_O32_23}"
SETS_N32_17="
mipsel3_n32_openrc
- mipsel3_n32_systemd_mu
mips3_n32_openrc
- mips3_n32_systemd_mu
"
SETS_N32_23="
@@ -52,9 +46,7 @@ SETS_N32="${SETS_N32_17} ${SETS_N32_23}"
SETS_N64_17="
mipsel3_n64_openrc
- mipsel3_n64_systemd_mu
mips3_n64_openrc
- mips3_n64_systemd_mu
"
SETS_N64_23="
@@ -68,9 +60,7 @@ SETS_N64="${SETS_N64_17} ${SETS_N64_23}"
SETS_MULTI_17="
mipsel3_multilib_openrc
- mipsel3_multilib_systemd_mu
mips3_multilib_openrc
- mips3_multilib_systemd_mu
"
SETS_MULTI_23="
@@ -86,18 +76,14 @@ SETS_MULTI="${SETS_MULTI_17} ${SETS_MULTI_23}"
# 17.0 O32
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec
stage3-mips2-o32-openrc.spec"
-SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec
stage3-mips2-o32-systemd-mu.spec"
SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec
stage3-mips2_softfloat-o32-openrc.spec"
-SET_mips2_softfloat_o32_systemd_mu_SPECS="stage1-mips2_softfloat-o32-systemd-mu.spec
stage3-mips2_softfloat-o32-systemd-mu.spec"
SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec
stage3-mips2-o32-musl.spec"
SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec
stage3-mipsel2-o32-openrc.spec"
-SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec
stage3-mipsel2-o32-systemd-mu.spec"
SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec
stage3-mipsel2_softfloat-o32-openrc.spec"
-SET_mipsel2_softfloat_o32_systemd_mu_SPECS="stage1-mipsel2_softfloat-o32-systemd-mu.spec
stage3-mipsel2_softfloat-o32-systemd-mu.spec"
SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec
stage3-mipsel2-o32-musl.spec"
@@ -122,10 +108,8 @@
SET_mipsel2_o32_musl_23_SPECS="o32/stage1-mipsel2-o32-musl-23.spec o32/stage3-mi
# 17.0 N32
SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec
stage3-mips3-n32-openrc.spec"
-SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec
stage3-mips3-n32-systemd-mu.spec"
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec
stage3-mipsel3-n32-openrc.spec"
-SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec
stage3-mipsel3-n32-systemd-mu.spec"
# 23.0 N32
@@ -138,10 +122,8 @@
SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec n32/sta
# 17.0 N64
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec
stage3-mips3-n64-openrc.spec"
-SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec
stage3-mips3-n64-systemd-mu.spec"
SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec
stage3-mipsel3-n64-openrc.spec"
-SET_mipsel3_n64_systemd_mu_SPECS="stage1-mipsel3-n64-systemd-mu.spec
stage3-mipsel3-n64-systemd-mu.spec"
# 23.0 N64
@@ -154,10 +136,8 @@
SET_mipsel3_n64_systemd_23_SPECS="n64/stage1-mipsel3-n64-systemd-23.spec n64/sta
# 17.0 multilib
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
-SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec
stage3-mips3-multilib-systemd-mu.spec"
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
-SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec
stage3-mipsel3-multilib-systemd-mu.spec"
# 23.0 multilib
@@ -191,43 +171,33 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-mips2-o32-openrc.spec)
- upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2" mips/17.0/mips2_o32
;;
stage3-mips2_softfloat-o32-openrc.spec)
- u
[gentoo-commits] proj/releng:master commit in: tools/
commit: d90528242b367c73b16fb96a962823c5582f4a2b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 23 09:55:58 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 23 09:55:58 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d9052824
Also upload 23.0 split-usr amd64 and arm64 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 8
tools/catalyst-auto-arm64.conf | 8
2 files changed, 16 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 733b2b6c..5d45b13f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -184,6 +184,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-splitusr >/dev/null || exit
+ case ${spec} in
+ stage3-openrc-23-su.spec)
+ upload stage3-amd64-openrc-splitusr-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
case ${spec} in
clang/stage3-openrc.spec)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index b2f01a4a..dc572bab 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -100,6 +100,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-splitusr" >/dev/null
+ case ${spec} in
+ stage3-openrc-23-su.spec)
+ upload stage3-${SUBARCH}-openrc-splitusr-${TIMESTAMP}*.xz*
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null
case ${spec} in
llvm/stage3-openrc.spec)
[gentoo-commits] proj/releng:master commit in: tools/
commit: 799a9897e0b0fb55db142a9e56ad254f8242e9b9
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 22:11:43 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 22:11:43 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=799a9897
Upload 23.0 stages for m68k
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-qemu-m68k.conf
b/tools/catalyst-auto-qemu-m68k.conf
index 86d21356..a33c3ca9 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -15,14 +15,11 @@ SETS="
systemd_23
musl_23
openrc
- systemd_mu
musl
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -51,28 +48,28 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
popd >/dev/null
;;
- stage3-systemd-mu.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz*
- popd >/dev/null
- ;;
stage3-musl.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- upload stage3-m68k_musl-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
popd >/dev/null
;;
+ stage3-openrc-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
+ upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
stage3-systemd-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
+ upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
popd >/dev/null
;;
stage3-musl-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ upload stage3-m68k_musl-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-m68k_musl" m68k/23.0/m68k_musl
popd >/dev/null
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: 7114a9599ada20816a3095d7e2dfe9e0b698f9db
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 22:08:06 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 22:08:06 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7114a959
Upload 23.0 stages for arm64 (2)
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-arm64.conf | 16
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm64.conf
b/tools/catalyst-auto-qemu-arm64.conf
index 28ce8dba..2afa2c87 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -10,13 +10,10 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -46,23 +43,18 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-openrc.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-aarch64_be"
arm64/23.0/aarch64_be
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 9c279acd20257de46267d46256fd007b454cf626
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 22:05:14 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 22:05:14 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=9c279acd
Upload 23.0 stages for loong
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 16
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-qemu-loong.conf
b/tools/catalyst-auto-qemu-loong.conf
index 6854851c..b35f9216 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -14,13 +14,10 @@ SETS="
openrc23
systemd23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -44,23 +41,18 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-openrc.spec)
- upload stage3-loong-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-loong" loong/22.0/loong
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload
stage3-loong-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-loong-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-loong-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-loong" loong/23.0/loong
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 257fab1bb7806ebab3201707cb2f4bd9e0105f44
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 22:01:04 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 22:01:04 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=257fab1b
Upload 23.0 stages for ia64
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ia64.conf | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 90d9320f..124bad01 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -9,14 +9,11 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -47,13 +44,13 @@ post_build() {
upload builds/default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload builds/default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
;;
- stage3-systemd-mu.spec)
- upload
builds/mergedusr/stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ stage3-openrc-23.spec)
+ upload
builds/23.0-default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-systemd-23.spec)
+ upload
builds/23.0-default/stage3-ia64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages packages/23.0-default/stage3-ia64
ia64/23.0/ia64
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 160dac9be23dfdf3ec6ae379c0df49b3b1dc1de5
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 21:57:52 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 21:57:52 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=160dac9b
Upload 23.0 stages for hppa
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-hppa.conf | 27 ---
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 7b3e9bb7..f07c6a39 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -11,21 +11,15 @@ SETS="
hppa20_openrc_23
hppa20_systemd_23
hppa11_openrc
- hppa11_systemd_mu
hppa20_openrc
- hppa20_systemd_mu
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec netboot-hppa32.spec"
-SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec
hppa1.1/stage3-systemd-mu.spec"
-
SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
-SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec
hppa2.0/stage3-systemd-mu.spec"
-
SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec
hppa1.1/stage3-openrc-23.spec"
SET_hppa11_systemd_23_SPECS="hppa1.1/stage1-systemd-23.spec
hppa1.1/stage3-systemd-23.spec"
@@ -76,11 +70,9 @@ post_build() {
upload install-hppa-minimal-*${TIMESTAMP}*.iso*
;;
hppa1.1/stage3-openrc.spec)
- upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
;;
hppa2.0/stage3-openrc.spec)
- upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
;;
esac
@@ -88,23 +80,20 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ hppa1.1/stage3-openrc-23.spec)
+ upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
+ ;;
hppa1.1/stage3-systemd-23.spec)
+ upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa1.1" hppa/23.0/hppa1.1
;;
+ hppa2.0/stage3-openrc-23.spec)
+ upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
+ ;;
hppa2.0/stage3-systemd-23.spec)
+ upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa2.0" hppa/23.0/hppa2.0
;;
esac
popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- hppa1.1/stage3-systemd-mu.spec)
- upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- hppa2.0/stage3-systemd-mu.spec)
- upload stage3-hppa2.0-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
}
[gentoo-commits] proj/releng:master commit in: tools/
commit: a08b60f67659b020a68b2e6e5a1dcf5136dd66e2
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 20:40:25 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 20:40:25 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=a08b60f6
Upload 23.0 stages for arm64
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-arm64.conf | 50 ++
1 file changed, 21 insertions(+), 29 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5d2d1268..b2f01a4a 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -16,9 +16,7 @@ SETS="
musl_hardened_23
musl_llvm_23
openrc
- systemd_mu
llvm_openrc
- llvm_systemd_mu
musl
musl_hardened
musl_llvm
@@ -27,8 +25,6 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec
stage3d-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec
stage3d-openrc-23.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
@@ -37,8 +33,6 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec
stage3-systemd-23.spec stage3d-syst
SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
-SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec
llvm/stage3-systemd-mu.spec"
-
SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
@@ -82,23 +76,26 @@ post_build() {
installcd-stage2-minimal.spec)
upload install-arm64-*${TIMESTAMP}*.iso*
;;
- stage3-openrc.spec)
+ esac
+ popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-openrc-23.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
# do not upsync_binpackages, done by extra builder
;;
- stage3d-openrc.spec)
+ stage3d-openrc-23.spec)
upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz*
+ stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- stage3d-systemd-mu.spec)
- upload
stage3-${SUBARCH}-desktop-systemd-mergedusr-${TIMESTAMP}*.xz*
+ stage3d-systemd-23.spec)
+ upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
esac
popd >/dev/null
@@ -106,7 +103,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null
case ${spec} in
llvm/stage3-openrc.spec)
- upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm
;;
esac
@@ -114,24 +110,19 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null
case ${spec} in
+ llvm/stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz*
+ ;;
llvm/stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-arm64" arm64/23.0/arm64_llvm
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" >/dev/null
- case ${spec} in
- llvm/stage3-systemd-mu.spec)
- upload
stage3-${SUBARCH}-llvm-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
case ${spec} in
musl/stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-arm64" arm64/17.0/arm64_musl
;;
esac
@@ -140,6 +131,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
musl/stage3-23.spec)
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpack
[gentoo-commits] proj/releng:master commit in: tools/
commit: 25c3771713eb4a911a808defff91ebb21c5db718
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 20:31:16 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 20:31:16 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=25c37717
Upload 23.0 stages for arm
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-arm.conf | 100 ++-
1 file changed, 41 insertions(+), 59 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 7ebd1be3..cce9a0f8 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -28,46 +28,34 @@ SETS="
armv7a_hf_musl_openrc_23
armv7a_hf_musl_hardened_openrc_23
armv4tl_openrc
- armv4tl_systemd_mu
armv5tel_openrc
- armv5tel_systemd_mu
armv6j_hf_openrc
- armv6j_hf_systemd_mu
armv6j_sf_openrc
- armv6j_sf_systemd_mu
armv6j_hf_musl_openrc
armv6j_hf_musl_hardened_openrc
armv7a_hf_openrc
- armv7a_hf_systemd_mu
armv7a_sf_openrc
- armv7a_sf_systemd_mu
armv7a_hf_musl_openrc
armv7a_hf_musl_hardened_openrc
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec
armv4tl/stage3-openrc.spec"
-SET_armv4tl_systemd_mu_SPECS="armv4tl/stage1-systemd-mu.spec
armv4tl/stage3-systemd-mu.spec"
SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec
armv5tel/stage3-openrc.spec"
-SET_armv5tel_systemd_mu_SPECS="armv5tel/stage1-systemd-mu.spec
armv5tel/stage3-systemd-mu.spec"
SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec
armv6j/stage3-hardfloat-openrc.spec"
-SET_armv6j_hf_systemd_mu_SPECS="armv6j/stage1-hardfloat-systemd-mu.spec
armv6j/stage3-hardfloat-systemd-mu.spec"
SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec
armv6j/stage3-openrc.spec"
-SET_armv6j_sf_systemd_mu_SPECS="armv6j/stage1-systemd-mu.spec
armv6j/stage3-systemd-mu.spec"
SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec
armv6j-musl/stage3-hardfloat.spec"
SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec
armv6j-musl-hardened/stage3-hardfloat.spec"
SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec
armv7a/stage3-hardfloat-openrc.spec"
-SET_armv7a_hf_systemd_mu_SPECS="armv7a/stage1-hardfloat-systemd-mu.spec
armv7a/stage3-hardfloat-systemd-mu.spec"
SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec
armv7a-musl/stage3-hardfloat.spec"
SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec
armv7a-musl-hardened/stage3-hardfloat.spec"
SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec
armv7a/stage3-openrc.spec"
-SET_armv7a_sf_systemd_mu_SPECS="armv7a/stage1-systemd-mu.spec
armv7a/stage3-systemd-mu.spec"
SET_armv4tl_openrc_23_SPECS="armv4tl/stage1-openrc-23.spec
armv4tl/stage3-openrc-23.spec"
SET_armv4tl_systemd_23_SPECS="armv4tl/stage1-systemd-23.spec
armv4tl/stage3-systemd-23.spec"
@@ -115,53 +103,71 @@ post_build() {
case ${spec} in
armv4tl/stage3-openrc.spec)
- upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv4tl" arm/17.0/armv4tl
;;
armv5tel/stage3-openrc.spec)
- upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv5tel" arm/17.0/armv5tel
;;
armv6j/stage3-openrc.spec)
- upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j" arm/17.0/armv6j
;;
armv6j/stage3-hardfloat-openrc.spec)
- upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j_hardfp"
arm/17.0/armv6j_hardfp
;;
armv7a/stage3-openrc.spec)
- upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a" arm/17.0/armv7a
;;
armv7a/stage3-hardfloat-openrc.spec)
- upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a_hardfp"
arm/17.0/armv7a_hardfp
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
- armv4tl/stage3-systemd-mu.spec)
- upload stage3-armv4tl-systemd-mergedusr-${TIMESTAMP}*.xz*
+ armv4tl/stage3-openrc-23.spec)
+ upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz*
+ ;;
+ armv4tl/s
[gentoo-commits] proj/releng:master commit in: tools/
commit: f5a35a1e42a091a16b532b273d58aea09c6177d6
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 20:18:37 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 20:18:37 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5a35a1e
Upload 23.0 stages for amd64
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 110 ++---
1 file changed, 48 insertions(+), 62 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a57c8e14..733b2b6c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -27,12 +27,9 @@ SETS="
x32_openrc_23
x32_systemd_23
openrc
- systemd_mu
livegui
nomultilib_openrc
- nomultilib_systemd_mu
llvm_openrc
- llvm_systemd_mu
hardened_openrc
hardened_nomultilib_openrc
hardened_selinux_openrc
@@ -41,7 +38,6 @@ SETS="
musl_hardened
musl_llvm
x32_openrc
- x32_systemd_mu
"
# 17.0
@@ -51,9 +47,6 @@ SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec
installcd-stage1.spec installcd-s
SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec
livegui/livegui-stage2.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec"
-
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec"
@@ -65,12 +58,8 @@
SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec
nomultilib/stage3-openrc.spec"
-SET_nomultilib_systemd_mu_SPECS="nomultilib/stage1-systemd-mu.spec
nomultilib/stage3-systemd-mu.spec"
-
SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
-SET_llvm_systemd_mu_SPECS="clang/stage1-systemd-mu.spec
clang/stage3-systemd-mu.spec"
-
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
SET_musl_llvm_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
@@ -79,8 +68,6 @@ SET_musl_hardened_SPECS="musl-hardened/stage1.spec
musl-hardened/stage3.spec"
SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
-SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec
x32/stage3-systemd-mu.spec"
-
# 23.0
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -150,22 +137,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
case ${spec} in
- stage3-openrc.spec)
- upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
- stage3d-openrc.spec)
- upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
- ;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
- nomultilib/stage3-openrc.spec)
- upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
x32/stage3-openrc.spec)
- upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
;;
livegui/livegui-stage2.spec)
@@ -176,25 +151,35 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
case ${spec} in
- x32/stage3-openrc-23.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
+ stage3-openrc-23.spec)
+ upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- esac
- popd >/dev/null || exit
-
- pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ stage3d-openrc-23.spec)
+ upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
+ stage3-systemd-23.spec)
+ upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
+ stage3d-systemd-23.spec)
+ upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- stage3d-systemd-mu.spec)
- upload
stage3-amd64-desktop-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ nomultilib/stage3-openrc-23.spec)
[gentoo-commits] proj/releng:master commit in: tools/
commit: 7cfc7ad757ff230b67849d7d11ab8a6c27db54c3
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 22 19:58:48 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 22 19:59:26 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7cfc7ad7
Upload 23.0 stages for alpha
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf
b/tools/catalyst-auto-qemu-alpha.conf
index 9b53185d..62a52805 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -10,12 +10,10 @@ SETS="
openrc23
systemd23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -45,23 +43,18 @@ post_build() {
upload install-alpha-minimal-${TIMESTAMP}.iso*
;;
stage3-openrc.spec)
- upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-alpha-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-alpha" alpha/23.0/alpha
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/amd64/
commit: c2462b3949110dff30ce2fcfda77305b365b0701
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Mar 21 13:39:05 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Mar 21 13:39:48 2024 +
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 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 ..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 ..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/
commit: 312a54f59d99d245b8139c5d64764b3b3b3313aa Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Mar 21 13:23:20 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Mar 21 13:39:45 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=312a54f5 Enable x86 23.0 musl build Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-x86.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index c83047ad..279d5e83 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -15,6 +15,7 @@ SETS=" i686_openrc_23 i686_systemd_23 hardened_openrc_23 + musl_23 i486_openrc i486_systemd_mu i686_openrc @@ -22,7 +23,6 @@ SETS=" hardened_openrc musl " -# 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"
[gentoo-commits] proj/releng:master commit in: tools/
commit: bd05aec8bee69ea770ca6b64d852a9fba3326a68
Author: Ben Kohler gentoo org>
AuthorDate: Tue Mar 19 16:13:35 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Mar 19 16:14:11 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=bd05aec8
catalyst-auto: allow skipping cleaning with CLST_AUTO_NOCLEAN var
Signed-off-by: Ben Kohler gentoo.org>
tools/catalyst-auto | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 3ee19d15..9624cebb 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -542,6 +542,9 @@ run_catalyst_commands() {
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:'
-e 's:\.spec$::')_purge.log"
specpath=$(readlink -f "${i}")
+ # Bail out of cleaning (eg) stage3-openrc.spec failure
if
+ # CLST_AUTO_NOCLEAN="stage3-openrc.spec" is set
+ [[ ${CLST_AUTO_NOCLEAN} == *${i}* ]] ||
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst
--purgetmponly -c "${CATALYST_CONFIG}" -f "${specpath}"
done
update_symlinks
[gentoo-commits] proj/releng:master commit in: tools/
commit: 84e4b0bde30a66bc2f6e40510c77d05350225f58
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 15 23:14:25 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 15 23:15:09 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=84e4b0bd
Build 23.0 first
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 30 +++---
tools/catalyst-auto-arm.conf| 32
tools/catalyst-auto-arm64.conf | 14 +++---
tools/catalyst-auto-ia64.conf | 4 ++--
tools/catalyst-auto-ppc.conf| 12 ++--
tools/catalyst-auto-ppc64le.conf| 12 ++--
tools/catalyst-auto-qemu-alpha.conf | 7 ++-
tools/catalyst-auto-qemu-arm64.conf | 4 ++--
tools/catalyst-auto-qemu-loong.conf | 4 ++--
tools/catalyst-auto-qemu-m68k.conf | 6 +++---
tools/catalyst-auto-qemu-riscv.conf | 16
tools/catalyst-auto-s390.conf | 4 ++--
tools/catalyst-auto-s390x.conf | 4 ++--
tools/catalyst-auto-sparc64.conf| 8
tools/catalyst-auto-x86.conf| 10 +-
15 files changed, 86 insertions(+), 81 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 75a0f9cc..4aa16c56 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -10,6 +10,21 @@ EMAIL_SUBJECT_PREPEND="[amd64-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
+ openrc_23
+ systemd_23
+ nomultilib_openrc_23
+ nomultilib_systemd_23
+ llvm_openrc_23
+ llvm_systemd_23
+ hardened_openrc_23
+ hardened_systemd_23
+ hardened_selinux_openrc_23
+ hardened_selinux_systemd_23
+ musl_23
+ musl_hardened_23
+ musl_llvm_23
+ x32_openrc_23
+ x32_systemd_23
openrc
systemd_mu
livegui
@@ -26,21 +41,6 @@ SETS="
musl_llvm
x32_openrc
x32_systemd_mu
- openrc_23
- systemd_23
- nomultilib_openrc_23
- nomultilib_systemd_23
- llvm_openrc_23
- llvm_systemd_23
- hardened_openrc_23
- hardened_systemd_23
- hardened_selinux_openrc_23
- hardened_selinux_systemd_23
- musl_23
- musl_hardened_23
- musl_llvm_23
- x32_openrc_23
- x32_systemd_23
"
# 17.0
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 37a590fe..7ebd1be3 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,22 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
- armv4tl_openrc
- armv4tl_systemd_mu
- armv5tel_openrc
- armv5tel_systemd_mu
- armv6j_hf_openrc
- armv6j_hf_systemd_mu
- armv6j_sf_openrc
- armv6j_sf_systemd_mu
- armv6j_hf_musl_openrc
- armv6j_hf_musl_hardened_openrc
- armv7a_hf_openrc
- armv7a_hf_systemd_mu
- armv7a_sf_openrc
- armv7a_sf_systemd_mu
- armv7a_hf_musl_openrc
- armv7a_hf_musl_hardened_openrc
armv4tl_openrc_23
armv4tl_systemd_23
armv5tel_openrc_23
@@ -43,6 +27,22 @@ SETS="
armv7a_sf_systemd_23
armv7a_hf_musl_openrc_23
armv7a_hf_musl_hardened_openrc_23
+ armv4tl_openrc
+ armv4tl_systemd_mu
+ armv5tel_openrc
+ armv5tel_systemd_mu
+ armv6j_hf_openrc
+ armv6j_hf_systemd_mu
+ armv6j_sf_openrc
+ armv6j_sf_systemd_mu
+ armv6j_hf_musl_openrc
+ armv6j_hf_musl_hardened_openrc
+ armv7a_hf_openrc
+ armv7a_hf_systemd_mu
+ armv7a_sf_openrc
+ armv7a_sf_systemd_mu
+ armv7a_hf_musl_openrc
+ armv7a_hf_musl_hardened_openrc
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec
armv4tl/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 61c7d67f..27b70c7e 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -7,13 +7,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=arm64
SETS="
- openrc
- systemd_mu
- llvm_openrc
- llvm_systemd_mu
- musl
- musl_hardened
- musl_llvm
openrc_23
systemd_23
llvm_openrc_23
@@ -21,6 +14,13 @@ SETS="
musl_23
musl_hardened_23
musl_llvm_23
+ openrc
+ systemd_mu
+ llvm_openrc
+ llvm_systemd_mu
+ musl
+ musl_hardened
+ musl_llvm
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index db010a8d..90d9320f 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -6,10 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SETS="
- openrc
- systemd_mu
[gentoo-commits] proj/releng:master commit in: tools/
commit: 03a0041dcd5ffa7667b06444c593fcde28ce258f
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Mar 14 10:21:43 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Mar 14 10:21:43 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=03a0041d
Upsync binpackages based on checksum
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index dac4deb5..3ee19d15 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -319,6 +319,7 @@ upsync_binpackages() {
--delay-updates
--mkpath
--min-size=1
+ --checksum
--stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/*
"${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
[gentoo-commits] proj/releng:master commit in: tools/
commit: eadc23f9494de6558f9a33ce9ebca48fa975fa7b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Mar 13 20:19:34 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Mar 13 20:19:34 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=eadc23f9
hppa: build 23.0 first
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-hppa.conf | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index f5ee4d2d..7b3e9bb7 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -6,14 +6,14 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
SETS="
- hppa11_openrc
- hppa11_systemd_mu
- hppa20_openrc
- hppa20_systemd_mu
hppa11_openrc_23
hppa11_systemd_23
hppa20_openrc_23
hppa20_systemd_23
+ hppa11_openrc
+ hppa11_systemd_mu
+ hppa20_openrc
+ hppa20_systemd_mu
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
[gentoo-commits] proj/releng:master commit in: tools/
commit: 742d47d26c87068a54f3c698646acf45548d5eab
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Mar 11 19:06:52 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Mar 11 19:06:52 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=742d47d2
Enable PPC64 LE musl builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ppc64le.conf | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index feaf8d49..6589b7d6 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -16,9 +16,9 @@ SETS="
systemd_23
openrc_power9le_23
systemd_power9le_23
+ musl_hardened_23
+ musl_hardened_power9le_23
"
-# musl_hardened_23
-# musl_hardened_power9le_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec
installcd-stage2-minimal.spec"
@@ -42,6 +42,10 @@ SET_openrc_power9le_23_SPECS="stage1-openrc-power9le-23.spec
stage3-openrc-power
SET_systemd_power9le_23_SPECS="stage1-systemd-power9le-23.spec
stage3-systemd-power9le-23.spec stage3d-systemd-power9le-23.spec"
+SET_musl_hardened_23_SPECS="stage1-musl-hardened-openrc-23.spec
stage3-musl-hardened-openrc-23.spec"
+
+SET_musl_hardened_power9le_23_SPECS="stage1-musl-hardened-openrc-power9le-23.spec
stage3-musl-hardened-openrc-power9le-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -106,6 +110,12 @@ post_build() {
stage3-systemd-power9le-23.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-power9le" ppc/23.0/power9le
;;
+ stage3-musl-hardened-openrc-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64le"
ppc/23.0/ppc64le_musl_hardened
+ ;;
+ stage3-musl-hardened-openrc-power9le-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-power9le"
ppc/23.0/power9le_musl_hardened
+ ;;
*)
echo "Finished ${spec}"
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: b3bd1c85726e08638138c1b5a06346003db26d2b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Mar 11 12:46:18 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Mar 11 12:46:18 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=b3bd1c85
Enable PPC BE musl builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ppc.conf | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 956a502a..72de76b0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -11,14 +11,14 @@ SETS="
musl_hardened
openrc_23
systemd_23
+ musl_hardened_23
openrc_64
systemd_mu_64
musl_hardened_64
openrc_64_23
systemd_64_23
+ musl_hardened_64_23
"
-# musl_hardened_23
-# musl_hardened_64_23
SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec
ppc32/installcd-stage2-minimal.spec"
@@ -37,10 +37,13 @@ SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec
ppc32/stage3-openrc-23.spec"
SET_systemd_23_SPECS="ppc32/stage1-systemd-23.spec
ppc32/stage3-systemd-23.spec"
+SET_musl_hardened_23_SPECS="ppc32/stage1-musl-hardened-openrc-23.spec
ppc32/stage3-musl-hardened-openrc-23.spec"
+
SET_openrc_64_23_SPECS="ppc64/stage1-openrc-23.spec
ppc64/stage3-openrc-23.spec"
SET_systemd_64_23_SPECS="ppc64/stage1-systemd-23.spec
ppc64/stage3-systemd-23.spec"
+SET_musl_hardened_64_23_SPECS="ppc64/stage1-musl-hardened-openrc-23.spec
ppc64/stage3-musl-hardened-openrc-23.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -99,9 +102,15 @@ post_build() {
ppc32/stage3-systemd-23.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc
;;
+ ppc32/stage3-musl-hardened-openrc-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc"
ppc/23.0/ppc_musl_hardened
+ ;;
ppc64/stage3-systemd-23.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64
;;
+ ppc64/stage3-musl-hardened-openrc-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64"
ppc/23.0/ppc64_musl_hardened
+ ;;
*)
echo "Finished ${spec}"
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: f4169454f41ac260806ba8e52d5f259baee832a4 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Mar 9 00:52:36 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Mar 9 00:52:36 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f4169454 Enable arm64 musl builds Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-arm64.conf | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index ac015b05..61c7d67f 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -18,11 +18,10 @@ SETS=" systemd_23 llvm_openrc_23 llvm_systemd_23 + musl_23 + musl_hardened_23 + musl_llvm_23 " -# needs musl-1.2.4 stable and new catalyst logic -# musl_23 -# musl_hardened_23 -# musl_llvm_23 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec" SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
[gentoo-commits] proj/releng:master commit in: tools/
commit: 185b70cb332107f43203d7cee2d5d3b02ed01e8a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 8 15:30:47 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 8 15:30:47 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=185b70cb
Move mips multilib to milou
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-4.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-4.conf
b/tools/catalyst-auto-qemu-mips-4.conf
index 690ca4f9..f7b4921b 100644
--- a/tools/catalyst-auto-qemu-mips-4.conf
+++ b/tools/catalyst-auto-qemu-mips-4.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_MULTI}
+UPLOAD_KEY=/root/.ssh/id_ed25519
[gentoo-commits] proj/releng:master commit in: tools/
commit: 70cdfe10fd26d889f2738995d1aabdf5b6532e8d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Mar 8 13:43:33 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Mar 8 13:43:56 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=70cdfe10
Move mips n32 to milou
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-2.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-2.conf
b/tools/catalyst-auto-qemu-mips-2.conf
index c40c6bc9..aee8636a 100644
--- a/tools/catalyst-auto-qemu-mips-2.conf
+++ b/tools/catalyst-auto-qemu-mips-2.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_N32}
+UPLOAD_KEY=/root/.ssh/id_ed25519
[gentoo-commits] proj/releng:master commit in: tools/
commit: 0c270e053876525716cf6a6391385ea4aab79920
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Mar 7 23:37:43 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Mar 7 23:37:43 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=0c270e05
Enable arm 23.0 musl builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-arm.conf | 36
1 file changed, 36 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index e8dd56e2..37a590fe 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -35,10 +35,14 @@ SETS="
armv6j_hf_systemd_23
armv6j_sf_openrc_23
armv6j_sf_systemd_23
+ armv6j_hf_musl_openrc_23
+ armv6j_hf_musl_hardened_openrc_23
armv7a_hf_openrc_23
armv7a_hf_systemd_23
armv7a_sf_openrc_23
armv7a_sf_systemd_23
+ armv7a_hf_musl_openrc_23
+ armv7a_hf_musl_hardened_openrc_23
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec
armv4tl/stage3-openrc.spec"
@@ -77,12 +81,18 @@
SET_armv6j_hf_systemd_23_SPECS="armv6j/stage1-hardfloat-systemd-23.spec armv6j/s
SET_armv6j_sf_openrc_23_SPECS="armv6j/stage1-openrc-23.spec
armv6j/stage3-openrc-23.spec"
SET_armv6j_sf_systemd_23_SPECS="armv6j/stage1-systemd-23.spec
armv6j/stage3-systemd-23.spec"
+SET_armv6j_hf_musl_openrc_23_SPECS="armv6j-musl/stage1-hardfloat-23.spec
armv6j-musl/stage3-hardfloat-23.spec"
+SET_armv6j_hf_musl_hardened_openrc_23_SPECS="armv6j-musl-hardened/stage1-hardfloat-23.spec
armv6j-musl-hardened/stage3-hardfloat-23.spec"
+
SET_armv7a_hf_openrc_23_SPECS="armv7a/stage1-hardfloat-openrc-23.spec
armv7a/stage3-hardfloat-openrc-23.spec"
SET_armv7a_hf_systemd_23_SPECS="armv7a/stage1-hardfloat-systemd-23.spec
armv7a/stage3-hardfloat-systemd-23.spec"
SET_armv7a_sf_openrc_23_SPECS="armv7a/stage1-openrc-23.spec
armv7a/stage3-openrc-23.spec"
SET_armv7a_sf_systemd_23_SPECS="armv7a/stage1-systemd-23.spec
armv7a/stage3-systemd-23.spec"
+SET_armv7a_hf_musl_openrc_23_SPECS="armv7a-musl/stage1-hardfloat-23.spec
armv7a-musl/stage3-hardfloat-23.spec"
+SET_armv7a_hf_musl_hardened_openrc_23_SPECS="armv7a-musl-hardened/stage1-hardfloat-23.spec
armv7a-musl-hardened/stage3-hardfloat-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
@@ -172,6 +182,19 @@ post_build() {
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+
+ case ${spec} in
+ armv7a-musl/stage3-hardfloat-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv7a_hardfp_musl"
arm/23.0/armv7a_hardfp_musl
+ ;;
+ armv6j-musl/stage3-hardfloat-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv6j_hardfp_musl"
arm/23.0/armv6j_hardfp_musl
+ ;;
+ esac
+
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
case ${spec} in
@@ -187,6 +210,19 @@ post_build() {
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
+
+ case ${spec} in
+ armv7a-musl-hardened/stage3-hardfloat-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv7a_hardfp_musl"
arm/23.0/armv7a_hardfp_musl_hardened
+ ;;
+ armv6j-musl-hardened/stage3-hardfloat-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv6j_hardfp_musl"
arm/23.0/armv6j_hardfp_musl_hardened
+ ;;
+ esac
+
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
[gentoo-commits] proj/releng:master commit in: tools/
commit: 9ef2ef41be26743ddcae0bcdafb898a5612c3a96
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Mar 7 18:44:53 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Mar 7 18:44:53 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=9ef2ef41
Enable amd64 23.0 musl builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 33 +
1 file changed, 33 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index ad73c416..75a0f9cc 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -36,6 +36,9 @@ SETS="
hardened_systemd_23
hardened_selinux_openrc_23
hardened_selinux_systemd_23
+ musl_23
+ musl_hardened_23
+ musl_llvm_23
x32_openrc_23
x32_systemd_23
"
@@ -101,6 +104,12 @@ SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
+SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
+
+SET_musl_llvm_23_SPECS="musl-llvm/stage1-23.spec musl-llvm/stage3-23.spec"
+
+SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec
musl-hardened/stage3-23.spec"
+
SET_x32_openrc_23_SPECS="x32/stage1-openrc-23.spec x32/stage3-openrc-23.spec"
SET_x32_systemd_23_SPECS="x32/stage1-systemd-23.spec
x32/stage3-systemd-23.spec"
@@ -250,6 +259,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-amd64" amd64/23.0/x86-64_musl
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
case ${spec} in
musl-clang/stage3.spec)
@@ -259,6 +276,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-llvm >/dev/null || exit
+ case ${spec} in
+ musl-llvm/stage3-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-amd64"
amd64/23.0/x86-64_musl_llvm
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
case ${spec} in
musl-hardened/stage3.spec)
@@ -267,6 +292,14 @@ post_build() {
;;
esac
popd >/dev/null || exit
+
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-hardened >/dev/null ||
exit
+ case ${spec} in
+ musl-hardened/stage3-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-amd64"
amd64/23.0/x86-64_musl_hardened
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
[gentoo-commits] proj/releng:master commit in: tools/
commit: dff9c4a41d67a7f3e7e023b918391d7be1b99e75
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Mar 4 23:05:07 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Mar 4 23:05:07 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=dff9c4a4
Adapt for mips n64 upload from milou
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-3.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-3.conf
b/tools/catalyst-auto-qemu-mips-3.conf
index 1321408b..8eec2676 100644
--- a/tools/catalyst-auto-qemu-mips-3.conf
+++ b/tools/catalyst-auto-qemu-mips-3.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_N64}
+UPLOAD_KEY=/root/.ssh/id_ed25519
[gentoo-commits] proj/releng:master commit in: tools/
commit: c876e6429a26e622761f2b5557b7ee385f152517
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Mar 2 14:36:54 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Mar 2 14:36:54 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=c876e642
Enable hppa 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-hppa.conf | 24
1 file changed, 24 insertions(+)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 2cddc6c5..f5ee4d2d 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -10,6 +10,10 @@ SETS="
hppa11_systemd_mu
hppa20_openrc
hppa20_systemd_mu
+ hppa11_openrc_23
+ hppa11_systemd_23
+ hppa20_openrc_23
+ hppa20_systemd_23
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
@@ -22,6 +26,15 @@ SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec
hppa2.0/stage3-systemd-mu.spec"
+SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec
hppa1.1/stage3-openrc-23.spec"
+
+SET_hppa11_systemd_23_SPECS="hppa1.1/stage1-systemd-23.spec
hppa1.1/stage3-systemd-23.spec"
+
+SET_hppa20_openrc_23_SPECS="hppa2.0/stage1-openrc-23.spec
hppa2.0/stage3-openrc-23.spec"
+
+SET_hppa20_systemd_23_SPECS="hppa2.0/stage1-systemd-23.spec
hppa2.0/stage3-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
@@ -73,6 +86,17 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ hppa1.1/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa1.1" hppa/23.0/hppa1.1
+ ;;
+ hppa2.0/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa2.0" hppa/23.0/hppa2.0
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
hppa1.1/stage3-systemd-mu.spec)
[gentoo-commits] proj/releng:master commit in: tools/
commit: 116775b9fc2e1a0418631c805174ee288b9920dc
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Feb 26 22:57:00 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Feb 26 22:57:00 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=116775b9
Enable amd64 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 67 ++
1 file changed, 67 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5ad68a57..ad73c416 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -26,8 +26,22 @@ SETS="
musl_llvm
x32_openrc
x32_systemd_mu
+ openrc_23
+ systemd_23
+ nomultilib_openrc_23
+ nomultilib_systemd_23
+ llvm_openrc_23
+ llvm_systemd_23
+ hardened_openrc_23
+ hardened_systemd_23
+ hardened_selinux_openrc_23
+ hardened_selinux_systemd_23
+ x32_openrc_23
+ x32_systemd_23
"
+# 17.0
+
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec
installcd-stage2-minimal.spec"
@@ -63,6 +77,35 @@ SET_x32_openrc_SPECS="x32/stage1-openrc.spec
x32/stage3-openrc.spec"
SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec
x32/stage3-systemd-mu.spec"
+# 23.0
+
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec"
+
+SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
+
+SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec
hardened/stage3-systemd-23.spec"
+
+SET_hardened_selinux_openrc_23_SPECS="hardened-selinux/stage1-openrc-23.spec
hardened-selinux/stage3-openrc-23.spec"
+
+SET_hardened_selinux_systemd_23_SPECS="hardened-selinux/stage1-systemd-23.spec
hardened-selinux/stage3-systemd-23.spec"
+
+SET_nomultilib_openrc_23_SPECS="nomultilib/stage1-openrc-23.spec
nomultilib/stage3-openrc-23.spec"
+
+SET_nomultilib_systemd_23_SPECS="nomultilib/stage1-systemd-23.spec
nomultilib/stage3-systemd-23.spec"
+
+SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
+
+SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
+
+SET_x32_openrc_23_SPECS="x32/stage1-openrc-23.spec x32/stage3-openrc-23.spec"
+
+SET_x32_systemd_23_SPECS="x32/stage1-systemd-23.spec
x32/stage3-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
@@ -119,6 +162,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
+ case ${spec} in
+ x32/stage3-openrc-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
case ${spec} in
stage3-systemd-mu.spec)
@@ -145,6 +196,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
+ case ${spec} in
+ llvm/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-amd64" amd64/23.0/x86-64_llvm
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/llvm-mergedusr >/dev/null || exit
case ${spec} in
clang/stage3-systemd-mu.spec)
@@ -174,6 +233,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
+ case ${spec} in
+ hardened/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64"
amd64/23.0/x86-64_hardened
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)
[gentoo-commits] proj/releng:master commit in: tools/
commit: d4ba4c0f8e7ff4b69815b2a22a80a7f19cb4e993
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Feb 25 21:49:28 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Feb 25 21:49:28 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d4ba4c0f
Enable mips multilib 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-common | 27 ++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 3fd8405d..96bd8b20 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -66,13 +66,23 @@ SETS_N64_23="
SETS_N64="${SETS_N64_17} ${SETS_N64_23}"
-SETS_MULTI="
+SETS_MULTI_17="
mipsel3_multilib_openrc
mipsel3_multilib_systemd_mu
mips3_multilib_openrc
mips3_multilib_systemd_mu
"
+SETS_MULTI_23="
+ mipsel3_multilib_openrc_23
+ mipsel3_multilib_systemd_23
+ mips3_multilib_openrc_23
+ mips3_multilib_systemd_23
+"
+
+SETS_MULTI="${SETS_MULTI_17} ${SETS_MULTI_23}"
+
+
# 17.0 O32
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec
stage3-mips2-o32-openrc.spec"
@@ -149,6 +159,15 @@
SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec
stage3-mipsel3-multilib-systemd-mu.spec"
+# 23.0 multilib
+
+SET_mips3_multilib_openrc_23_SPECS="multilib/stage1-mips3-multilib-openrc-23.spec
multilib/stage3-mips3-multilib-openrc-23.spec"
+SET_mips3_multilib_systemd_23_SPECS="multilib/stage1-mips3-multilib-systemd-23.spec
multilib/stage3-mips3-multilib-systemd-23.spec"
+
+SET_mipsel3_multilib_openrc_23_SPECS="multilib/stage1-mipsel3-multilib-openrc-23.spec
multilib/stage3-mipsel3-multilib-openrc-23.spec"
+SET_mipsel3_multilib_systemd_23_SPECS="multilib/stage1-mipsel3-multilib-systemd-23.spec
multilib/stage3-mipsel3-multilib-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
@@ -240,6 +259,12 @@ post_build() {
n64/stage3-mipsel3-n64-systemd-23.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n64"
mips/23.0/mipsel3_n64
;;
+ multilib/stage3-mips3-multilib-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_multilib"
mips/23.0/mips3_multilib
+ ;;
+ multilib/stage3-mipsel3-multilib-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_multilib"
mips/23.0/mipsel3_multilib
+ ;;
esac
popd >/dev/null
[gentoo-commits] proj/releng:master commit in: tools/
commit: 5c370bdac66ebea6de3fd6be00ced533856eb9c9
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Feb 24 19:41:31 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Feb 24 19:41:31 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=5c370bda
Enable mips n64 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-common | 41
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 22bddf80..3fd8405d 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -50,13 +50,22 @@ SETS_N32_23="
SETS_N32="${SETS_N32_17} ${SETS_N32_23}"
-SETS_N64="
+SETS_N64_17="
mipsel3_n64_openrc
mipsel3_n64_systemd_mu
mips3_n64_openrc
mips3_n64_systemd_mu
"
+SETS_N64_23="
+ mipsel3_n64_openrc_23
+ mipsel3_n64_systemd_23
+ mips3_n64_openrc_23
+ mips3_n64_systemd_23
+"
+
+SETS_N64="${SETS_N64_17} ${SETS_N64_23}"
+
SETS_MULTI="
mipsel3_multilib_openrc
mipsel3_multilib_systemd_mu
@@ -116,14 +125,6 @@
SET_mips3_n32_systemd_23_SPECS="n32/stage1-mips3-n32-systemd-23.spec n32/stage3-
SET_mipsel3_n32_openrc_23_SPECS="n32/stage1-mipsel3-n32-openrc-23.spec
n32/stage3-mipsel3-n32-openrc-23.spec"
SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec
n32/stage3-mipsel3-n32-systemd-23.spec"
-# 17.0 multilib
-
-SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
-SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec
stage3-mips3-multilib-systemd-mu.spec"
-
-SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
-SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec
stage3-mipsel3-multilib-systemd-mu.spec"
-
# 17.0 N64
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec
stage3-mips3-n64-openrc.spec"
@@ -132,6 +133,22 @@
SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec stage3-mips3-n6
SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec
stage3-mipsel3-n64-openrc.spec"
SET_mipsel3_n64_systemd_mu_SPECS="stage1-mipsel3-n64-systemd-mu.spec
stage3-mipsel3-n64-systemd-mu.spec"
+# 23.0 N64
+
+SET_mips3_n64_openrc_23_SPECS="n64/stage1-mips3-n64-openrc-23.spec
n64/stage3-mips3-n64-openrc-23.spec"
+SET_mips3_n64_systemd_23_SPECS="n64/stage1-mips3-n64-systemd-23.spec
n64/stage3-mips3-n64-systemd-23.spec"
+
+SET_mipsel3_n64_openrc_23_SPECS="n64/stage1-mipsel3-n64-openrc-23.spec
n64/stage3-mipsel3-n64-openrc-23.spec"
+SET_mipsel3_n64_systemd_23_SPECS="n64/stage1-mipsel3-n64-systemd-23.spec
n64/stage3-mipsel3-n64-systemd-23.spec"
+
+# 17.0 multilib
+
+SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
+SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec
stage3-mips3-multilib-systemd-mu.spec"
+
+SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
+SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec
stage3-mipsel3-multilib-systemd-mu.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
@@ -217,6 +234,12 @@ post_build() {
n32/stage3-mipsel3-n32-systemd-23.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n32"
mips/23.0/mipsel3_n32
;;
+ n64/stage3-mips3-n64-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_n64"
mips/23.0/mips3_n64
+ ;;
+ n64/stage3-mipsel3-n64-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n64"
mips/23.0/mipsel3_n64
+ ;;
esac
popd >/dev/null
[gentoo-commits] proj/releng:master commit in: tools/
commit: 955caaafde0d18e676caae8b918d7519300f8f7e
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Feb 24 14:33:37 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Feb 24 14:33:37 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=955caaaf
Enable mips n32 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-common | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 60864409..22bddf80 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -34,13 +34,22 @@ SETS_O32_23="
SETS_O32="${SETS_O32_17} ${SETS_O32_23}"
-SETS_N32="
+SETS_N32_17="
mipsel3_n32_openrc
mipsel3_n32_systemd_mu
mips3_n32_openrc
mips3_n32_systemd_mu
"
+SETS_N32_23="
+ mipsel3_n32_openrc_23
+ mipsel3_n32_systemd_23
+ mips3_n32_openrc_23
+ mips3_n32_systemd_23
+"
+
+SETS_N32="${SETS_N32_17} ${SETS_N32_23}"
+
SETS_N64="
mipsel3_n64_openrc
mipsel3_n64_systemd_mu
@@ -99,6 +108,14 @@
SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n3
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec
stage3-mipsel3-n32-openrc.spec"
SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec
stage3-mipsel3-n32-systemd-mu.spec"
+# 23.0 N32
+
+SET_mips3_n32_openrc_23_SPECS="n32/stage1-mips3-n32-openrc-23.spec
n32/stage3-mips3-n32-openrc-23.spec"
+SET_mips3_n32_systemd_23_SPECS="n32/stage1-mips3-n32-systemd-23.spec
n32/stage3-mips3-n32-systemd-23.spec"
+
+SET_mipsel3_n32_openrc_23_SPECS="n32/stage1-mipsel3-n32-openrc-23.spec
n32/stage3-mipsel3-n32-openrc-23.spec"
+SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec
n32/stage3-mipsel3-n32-systemd-23.spec"
+
# 17.0 multilib
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
@@ -194,6 +211,12 @@ post_build() {
o32/stage3-mipsel2_softfloat-o32-systemd-23.spec)
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel2_softfloat"
mips/23.0/mipsel2_o32_sf
;;
+ n32/stage3-mips3-n32-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_n32"
mips/23.0/mips3_n32
+ ;;
+ n32/stage3-mipsel3-n32-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n32"
mips/23.0/mipsel3_n32
+ ;;
esac
popd >/dev/null
[gentoo-commits] proj/releng:master commit in: tools/
commit: 70e01099077efae08218a80d66eda222c0b949cc
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Feb 24 13:51:42 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Feb 24 13:51:42 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=70e01099
Enable mips o32 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-common | 70 +++-
1 file changed, 69 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 7f06eea8..60864409 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS_O32="
+SETS_O32_17="
mipsel2_softfloat_o32_openrc
mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
@@ -19,6 +19,21 @@ SETS_O32="
mips2_o32_musl
"
+SETS_O32_23="
+ mipsel2_softfloat_o32_openrc_23
+ mipsel2_softfloat_o32_systemd_23
+ mipsel2_o32_openrc_23
+ mipsel2_o32_systemd_23
+ mipsel2_o32_musl_23
+ mips2_softfloat_o32_openrc_23
+ mips2_softfloat_o32_systemd_23
+ mips2_o32_openrc_23
+ mips2_o32_systemd_23
+ mips2_o32_musl_23
+"
+
+SETS_O32="${SETS_O32_17} ${SETS_O32_23}"
+
SETS_N32="
mipsel3_n32_openrc
mipsel3_n32_systemd_mu
@@ -40,6 +55,7 @@ SETS_MULTI="
mips3_multilib_systemd_mu
"
+# 17.0 O32
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec
stage3-mips2-o32-openrc.spec"
SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec
stage3-mips2-o32-systemd-mu.spec"
@@ -57,18 +73,42 @@
SET_mipsel2_softfloat_o32_systemd_mu_SPECS="stage1-mipsel2_softfloat-o32-systemd
SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec
stage3-mipsel2-o32-musl.spec"
+# 23.0 O32
+
+SET_mips2_o32_openrc_23_SPECS="o32/stage1-mips2-o32-openrc-23.spec
o32/stage3-mips2-o32-openrc-23.spec"
+SET_mips2_o32_systemd_23_SPECS="o32/stage1-mips2-o32-systemd-23.spec
o32/stage3-mips2-o32-systemd-23.spec"
+
+SET_mips2_softfloat_o32_openrc_23_SPECS="o32/stage1-mips2_softfloat-o32-openrc-23.spec
o32/stage3-mips2_softfloat-o32-openrc-23.spec"
+SET_mips2_softfloat_o32_systemd_23_SPECS="o32/stage1-mips2_softfloat-o32-systemd-23.spec
o32/stage3-mips2_softfloat-o32-systemd-23.spec"
+
+SET_mips2_o32_musl_23_SPECS="o32/stage1-mips2-o32-musl-23.spec
o32/stage3-mips2-o32-musl-23.spec"
+
+SET_mipsel2_o32_openrc_23_SPECS="o32/stage1-mipsel2-o32-openrc-23.spec
o32/stage3-mipsel2-o32-openrc-23.spec"
+SET_mipsel2_o32_systemd_23_SPECS="o32/stage1-mipsel2-o32-systemd-23.spec
o32/stage3-mipsel2-o32-systemd-23.spec"
+
+SET_mipsel2_softfloat_o32_openrc_23_SPECS="o32/stage1-mipsel2_softfloat-o32-openrc-23.spec
o32/stage3-mipsel2_softfloat-o32-openrc-23.spec"
+SET_mipsel2_softfloat_o32_systemd_23_SPECS="o32/stage1-mipsel2_softfloat-o32-systemd-23.spec
o32/stage3-mipsel2_softfloat-o32-systemd-23.spec"
+
+SET_mipsel2_o32_musl_23_SPECS="o32/stage1-mipsel2-o32-musl-23.spec
o32/stage3-mipsel2-o32-musl-23.spec"
+
+# 17.0 N32
+
SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec
stage3-mips3-n32-openrc.spec"
SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec
stage3-mips3-n32-systemd-mu.spec"
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec
stage3-mipsel3-n32-openrc.spec"
SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec
stage3-mipsel3-n32-systemd-mu.spec"
+# 17.0 multilib
+
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec
stage3-mips3-multilib-systemd-mu.spec"
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec
stage3-mipsel3-multilib-systemd-mu.spec"
+# 17.0 N64
+
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec
stage3-mips3-n64-openrc.spec"
SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec
stage3-mips3-n64-systemd-mu.spec"
@@ -140,6 +180,23 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ o32/stage3-mips2-o32-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips2" mips/23.0/mips2_o32
+ ;;
+ o32/stage3-mips2_softfloat-o32-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips2_softfloat"
mips/23.0/mips2_o32_sf
+ ;;
+ o32/stage3-mipsel2-o32-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel2"
mi
[gentoo-commits] proj/releng:master commit in: tools/
commit: 456173c3212e5bcac176f17119b4c7763697f405
Author: Ian Jordan gmail com>
AuthorDate: Mon Jul 17 18:12:58 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Feb 20 20:43:53 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=456173c3
tools/catalyst-auto: Remove treeish sed
Removes line which allowed catalyst-auto to convert to snapshot_treeish
on the fly as it's no longer needed.
Signed-off-by: Ian Jordan gmail.com>
Signed-off-by: Matt Turner gentoo.org>
tools/catalyst-auto | 4
1 file changed, 4 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 28a92611..dac4deb5 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -436,10 +436,6 @@ run_catalyst_commands() {
done
fi
- if [[ -n ${TREEISH} ]]; then
- sed -i -e "s|snapshot:.*|snapshot_treeish:
${TREEISH}|g" "${i}"
- fi
-
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
[gentoo-commits] proj/releng:master commit in: tools/
commit: 0629ad5028e9915ceb8bc781aa10f7d142da31b6
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Feb 20 17:16:09 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Feb 20 17:16:09 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=0629ad50
Adapt for build of MIPS o32 on milou
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-1.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-1.conf
b/tools/catalyst-auto-qemu-mips-1.conf
index bf7dee78..77036e73 100644
--- a/tools/catalyst-auto-qemu-mips-1.conf
+++ b/tools/catalyst-auto-qemu-mips-1.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_O32}
+UPLOAD_KEY=/root/.ssh/id_ed25519
[gentoo-commits] proj/releng:master commit in: tools/
commit: 20e1b92f33766e90069fc05d2b177fe054f6c456
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Feb 19 19:04:52 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Feb 19 19:04:52 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=20e1b92f
mips: do LE builds first
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-common | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 4a3b00f6..7f06eea8 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -7,37 +7,37 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
SETS_O32="
- mips2_softfloat_o32_openrc
- mips2_softfloat_o32_systemd_mu
- mips2_o32_openrc
- mips2_o32_systemd_mu
- mips2_o32_musl
mipsel2_softfloat_o32_openrc
mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
mipsel2_o32_systemd_mu
mipsel2_o32_musl
+ mips2_softfloat_o32_openrc
+ mips2_softfloat_o32_systemd_mu
+ mips2_o32_openrc
+ mips2_o32_systemd_mu
+ mips2_o32_musl
"
SETS_N32="
- mips3_n32_openrc
- mips3_n32_systemd_mu
mipsel3_n32_openrc
mipsel3_n32_systemd_mu
+ mips3_n32_openrc
+ mips3_n32_systemd_mu
"
SETS_N64="
- mips3_n64_openrc
- mips3_n64_systemd_mu
mipsel3_n64_openrc
mipsel3_n64_systemd_mu
+ mips3_n64_openrc
+ mips3_n64_systemd_mu
"
SETS_MULTI="
- mips3_multilib_openrc
- mips3_multilib_systemd_mu
mipsel3_multilib_openrc
mipsel3_multilib_systemd_mu
+ mips3_multilib_openrc
+ mips3_multilib_systemd_mu
"
[gentoo-commits] proj/releng:master commit in: tools/
commit: 858d00cd634502fed8325caacbb1fbe4e8291c1f
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Feb 16 22:09:33 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Feb 16 22:09:33 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=858d00cd
Enable ia64 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ia64.conf | 25 +++--
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 47c24f74..db010a8d 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -8,6 +8,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SETS="
openrc
systemd_mu
+ openrc_23
+ systemd_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
@@ -15,6 +17,11 @@ SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
update_symlinks() {
@@ -34,22 +41,20 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}" >/dev/null
case ${spec} in
installcd-stage2*)
- upload *${TIMESTAMP}*.iso*
+ upload builds/default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64
+ upload builds/default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
+ upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
stage3-systemd-mu.spec)
- upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ upload
builds/mergedusr/stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-systemd-23.spec)
+ upsync_binpackages packages/23.0-default/stage3-ia64
ia64/23.0/ia64
;;
esac
popd >/dev/null
[gentoo-commits] proj/releng:master commit in: tools/
commit: 48dfd4a007e2351ce528f02b7e0e03c40b7f8ee0
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Feb 15 17:39:32 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Feb 15 17:39:32 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=48dfd4a0
Enable 23.0 aarch64_be builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-arm64.conf | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm64.conf
b/tools/catalyst-auto-qemu-arm64.conf
index 20654770..cdd098b1 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -9,14 +9,18 @@ SUBARCH=aarch64_be
SETS="
openrc
systemd_mu
+ openrc_23
+ systemd_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
@@ -55,4 +59,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-aarch64_be"
arm64/23.0/aarch64_be
+ ;;
+ esac
+ popd >/dev/null
}
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/arm64/be/
commit: f5690d5bbc755ea6d74e8ce2a026198f1480067d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Feb 13 22:55:56 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Feb 13 22:55:56 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5690d5b
Disable aarch64_be split-usr systemd builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs-qemu/arm64/be/stage1-systemd.spec | 13 -
releases/specs-qemu/arm64/be/stage3-systemd.spec | 12
tools/catalyst-auto-qemu-arm64.conf | 10 +-
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/releases/specs-qemu/arm64/be/stage1-systemd.spec
b/releases/specs-qemu/arm64/be/stage1-systemd.spec
deleted file mode 100644
index 1c175344..
--- a/releases/specs-qemu/arm64/be/stage1-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: aarch64_be
-version_stamp: systemd-@TIMESTAMP@
-target: stage1
-rel_type: default
-profile: default/linux/arm64/17.0/big-endian/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-aarch64_be-systemd-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-aarch64_be
diff --git a/releases/specs-qemu/arm64/be/stage3-systemd.spec
b/releases/specs-qemu/arm64/be/stage3-systemd.spec
deleted file mode 100644
index 98c13e85..
--- a/releases/specs-qemu/arm64/be/stage3-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: aarch64_be
-version_stamp: systemd-@TIMESTAMP@
-target: stage3
-rel_type: default
-profile: default/linux/arm64/17.0/big-endian/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-aarch64_be-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-aarch64_be
-binrepo_path: arm64/binpackages/17.0/aarch64_be
diff --git a/tools/catalyst-auto-qemu-arm64.conf
b/tools/catalyst-auto-qemu-arm64.conf
index 19aa9722..20654770 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -6,7 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm64/be
SUBARCH=aarch64_be
-SETS="openrc systemd systemd_mu"
+SETS="
+ openrc
+ systemd_mu
+"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
@@ -22,7 +25,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -40,9 +43,6 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 760e4c8e096a2882fd3ec06022fd50bcedaa33b8 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Feb 13 22:43:13 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Feb 13 22:43:13 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=760e4c8e Enable 23.0 m68k musl build Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-qemu-m68k.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf index 62e6ccac..06afd027 100644 --- a/tools/catalyst-auto-qemu-m68k.conf +++ b/tools/catalyst-auto-qemu-m68k.conf @@ -16,8 +16,8 @@ SETS=" musl openrc_23 systemd_23 + musl_23 " -# musl_23 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" @@ -26,6 +26,7 @@ SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" SET_musl_SPECS="stage1-musl.spec stage3-musl.spec" SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec" + SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec" SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-23.spec"
[gentoo-commits] proj/releng:master commit in: tools/
commit: e174d90543fffd6005ccbef1285d881b4bd97e3b Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Feb 10 21:38:01 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Feb 10 21:38:01 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=e174d905 Enable riscv 23.0 musl builds Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-qemu-riscv.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 3b3573d6..3be768fb 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -21,8 +21,10 @@ SETS=" multilib_systemd_mu lp64d_openrc_23 lp64d_systemd_23 + lp64d_musl_23 lp64_openrc_23 lp64_systemd_23 + lp64_musl_23 multilib_openrc_23 multilib_systemd_23 "
[gentoo-commits] proj/releng:master commit in: tools/
commit: e6f21b105af12713423574f481d86a47f88847d7
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Feb 10 16:20:57 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Feb 10 16:20:57 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=e6f21b10
Enable ppc64 LE 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ppc64le.conf | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 67061610..feaf8d49 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -12,7 +12,13 @@ SETS="
systemd_power9le_mu
musl_hardened
musl_hardened_power9le
+ openrc_23
+ systemd_23
+ openrc_power9le_23
+ systemd_power9le_23
"
+# musl_hardened_23
+# musl_hardened_power9le_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec
installcd-stage2-minimal.spec"
@@ -27,6 +33,15 @@ SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec
stage3-musl-hardened-o
SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec
stage3-musl-hardened-openrc-power9le.spec"
+
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
+SET_openrc_power9le_23_SPECS="stage1-openrc-power9le-23.spec
stage3-openrc-power9le-23.spec stage3d-openrc-power9le-23.spec"
+
+SET_systemd_power9le_23_SPECS="stage1-systemd-power9le-23.spec
stage3-systemd-power9le-23.spec stage3d-systemd-power9le-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -35,7 +50,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in
"${BUILD_SRCDIR_BASE}"/builds/{default,mergedusr,power9le,power9le-mergedusr,musl-hardened,power9le-musl-hardened}
; do
+ for d in "${BUILD_SRCDIR_BASE}"/builds/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for t in ppc64le power9le; do
@@ -85,6 +100,12 @@ post_build() {
upload
power9le-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le"
ppc/17.0/power9le_musl_hardened
;;
+ stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64le" ppc/23.0/ppc64le
+ ;;
+ stage3-systemd-power9le-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-power9le" ppc/23.0/power9le
+ ;;
*)
echo "Finished ${spec}"
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: 24d1bf2d94029cc25b89e085d1ebc445cc0f9407
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Feb 10 15:36:05 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Feb 10 15:36:05 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=24d1bf2d
Enable ppc(64) BE 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ppc.conf | 51 +++-
1 file changed, 41 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 2e3e8236..956a502a 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -4,19 +4,44 @@
UPLOAD_USER=ppc
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc
+
+SETS="
+ openrc
+ systemd_mu
+ musl_hardened
+ openrc_23
+ systemd_23
+ openrc_64
+ systemd_mu_64
+ musl_hardened_64
+ openrc_64_23
+ systemd_64_23
+"
+# musl_hardened_23
+# musl_hardened_64_23
-SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec
ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
-#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
-#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
-#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
+SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec
ppc32/installcd-stage2-minimal.spec"
+
+SET_systemd_mu_SPECS="ppc32/stage1-systemd-mu.spec
ppc32/stage3-systemd-mu.spec"
+
+SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec
ppc32/stage3-musl-hardened-openrc.spec"
+
+SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
+
+SET_systemd_mu_64_SPECS="ppc64/stage1-systemd-mu.spec
ppc64/stage3-systemd-mu.spec"
+
+SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec
ppc64/stage3-musl-hardened-openrc.spec"
+
+SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="ppc32/stage1-systemd-23.spec
ppc32/stage3-systemd-23.spec"
+
+SET_openrc_64_23_SPECS="ppc64/stage1-openrc-23.spec
ppc64/stage3-openrc-23.spec"
-OPTIONAL_SPECS="ppc32/installcd-stage1.spec
ppc32/installcd-stage2-minimal.spec"
+SET_systemd_64_23_SPECS="ppc64/stage1-systemd-23.spec
ppc64/stage3-systemd-23.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd-mu.spec
ppc64/stage3-systemd-mu.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec
ppc64/stage3-musl-hardened-openrc.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd-mu.spec
ppc32/stage3-systemd-mu.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec
ppc32/stage3-musl-hardened-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -25,7 +50,7 @@ EMAIL_SUBJECT_PREPEND="[ppc-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in
"${BUILD_SRCDIR_BASE}/builds"/{default,musl-hardened,mergedusr} ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -71,6 +96,12 @@ post_build() {
upload
musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64"
ppc/17.0/ppc64_musl_hardened
;;
+ ppc32/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc
+ ;;
+ ppc64/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64
+ ;;
*)
echo "Finished ${spec}"
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: be2fa5fd6723828765f0273459db7e4679eb895b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Feb 5 21:12:39 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Feb 5 21:12:39 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=be2fa5fd
Write some stats about binpkg uploads in the log
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index b7124fe8..28a92611 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -319,6 +319,7 @@ upsync_binpackages() {
--delay-updates
--mkpath
--min-size=1
+ --stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/*
"${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
else
[gentoo-commits] proj/releng:master commit in: tools/
commit: d6366affce217cde96924bd60d524a668ac42741
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Feb 5 13:38:53 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Feb 5 13:38:53 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d6366aff
Fix key names for move demeter => milou
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
tools/catalyst-auto-qemu-alpha.conf | 2 +-
tools/catalyst-auto-qemu-arm64.conf | 2 +-
tools/catalyst-auto-qemu-loong.conf | 2 +-
tools/catalyst-auto-qemu-m68k.conf | 2 +-
tools/catalyst-auto-qemu-riscv.conf | 2 +-
tools/catalyst-auto-x86.conf| 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 40b97527..5ad68a57 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=amd64
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
EMAIL_SUBJECT_PREPEND="[amd64-auto]"
diff --git a/tools/catalyst-auto-qemu-alpha.conf
b/tools/catalyst-auto-qemu-alpha.conf
index cea886dc..04d3d8c9 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=alpha
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
diff --git a/tools/catalyst-auto-qemu-arm64.conf
b/tools/catalyst-auto-qemu-arm64.conf
index 03bcfd96..19aa9722 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=arm64
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm64/be
SUBARCH=aarch64_be
diff --git a/tools/catalyst-auto-qemu-loong.conf
b/tools/catalyst-auto-qemu-loong.conf
index 415c3e32..08470313 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=loong
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
diff --git a/tools/catalyst-auto-qemu-m68k.conf
b/tools/catalyst-auto-qemu-m68k.conf
index f2154c4a..62e6ccac 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=m68k
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index bcf6ea2e..3b3573d6 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=riscv
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 2e8d5b86..896b9c2e 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=x86
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
EMAIL_SUBJECT_PREPEND="[x86-auto]"
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/s390/s390x/
commit: 033c08e766adc7fe9ad379badf818995fc385628
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Jan 30 18:43:45 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Jan 30 18:43:45 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=033c08e7
Add s390 64bit 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/s390/s390x/stage1-openrc-23.spec | 11 +++
releases/specs/s390/s390x/stage1-systemd-23.spec | 11 +++
releases/specs/s390/s390x/stage3-openrc-23.spec | 10 ++
releases/specs/s390/s390x/stage3-systemd-23.spec | 10 ++
tools/catalyst-auto-s390x.conf | 20 +++-
5 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/releases/specs/s390/s390x/stage1-openrc-23.spec
b/releases/specs/s390/s390x/stage1-openrc-23.spec
new file mode 100644
index ..241d38b8
--- /dev/null
+++ b/releases/specs/s390/s390x/stage1-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: s390x
+version_stamp: openrc-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390x-openrc-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
diff --git a/releases/specs/s390/s390x/stage1-systemd-23.spec
b/releases/specs/s390/s390x/stage1-systemd-23.spec
new file mode 100644
index ..82204159
--- /dev/null
+++ b/releases/specs/s390/s390x/stage1-systemd-23.spec
@@ -0,0 +1,11 @@
+subarch: s390x
+version_stamp: systemd-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390x-systemd-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
diff --git a/releases/specs/s390/s390x/stage3-openrc-23.spec
b/releases/specs/s390/s390x/stage3-openrc-23.spec
new file mode 100644
index ..9cc3370e
--- /dev/null
+++ b/releases/specs/s390/s390x/stage3-openrc-23.spec
@@ -0,0 +1,10 @@
+subarch: s390x
+version_stamp: openrc-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390x-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390x
diff --git a/releases/specs/s390/s390x/stage3-systemd-23.spec
b/releases/specs/s390/s390x/stage3-systemd-23.spec
new file mode 100644
index ..4c24ff88
--- /dev/null
+++ b/releases/specs/s390/s390x/stage3-systemd-23.spec
@@ -0,0 +1,10 @@
+subarch: s390x
+version_stamp: systemd-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/s390x/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390x-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390x
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index f4fe9d83..8627b6fa 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -6,15 +6,25 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
SUBARCH=s390x
-SETS="openrc systemd_mu"
+SETS="
+ openrc
+ systemd_mu
+ openrc_23
+ systemd_23
+"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -47,6 +57,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
stage3-systemd-mu.spec)
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/s390/s390/
commit: 6965de36ee06bcaecace0233c44a2afcfd08c534
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jan 29 03:18:42 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Jan 29 03:18:42 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=6965de36
Enable s390 23.0 32bit builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/s390/s390/stage1-openrc-23.spec | 11 +++
releases/specs/s390/s390/stage1-systemd-23.spec | 11 +++
releases/specs/s390/s390/stage3-openrc-23.spec | 10 ++
releases/specs/s390/s390/stage3-systemd-23.spec | 10 ++
tools/catalyst-auto-s390.conf | 20 +++-
5 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/releases/specs/s390/s390/stage1-openrc-23.spec
b/releases/specs/s390/s390/stage1-openrc-23.spec
new file mode 100644
index ..b9f1e91d
--- /dev/null
+++ b/releases/specs/s390/s390/stage1-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: s390
+version_stamp: openrc-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390-openrc-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
diff --git a/releases/specs/s390/s390/stage1-systemd-23.spec
b/releases/specs/s390/s390/stage1-systemd-23.spec
new file mode 100644
index ..bf316dee
--- /dev/null
+++ b/releases/specs/s390/s390/stage1-systemd-23.spec
@@ -0,0 +1,11 @@
+subarch: s390
+version_stamp: systemd-@TIMESTAMP@
+target: stage1
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-s390-systemd-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
diff --git a/releases/specs/s390/s390/stage3-openrc-23.spec
b/releases/specs/s390/s390/stage3-openrc-23.spec
new file mode 100644
index ..d075c81c
--- /dev/null
+++ b/releases/specs/s390/s390/stage3-openrc-23.spec
@@ -0,0 +1,10 @@
+subarch: s390
+version_stamp: openrc-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390
diff --git a/releases/specs/s390/s390/stage3-systemd-23.spec
b/releases/specs/s390/s390/stage3-systemd-23.spec
new file mode 100644
index ..f7489afa
--- /dev/null
+++ b/releases/specs/s390/s390/stage3-systemd-23.spec
@@ -0,0 +1,10 @@
+subarch: s390
+version_stamp: systemd-@TIMESTAMP@
+target: stage3
+rel_type: 23.0-default
+profile: default/linux/s390/23.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-s390-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+binrepo_path: s390/binpackages/23.0/s390
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index a9cbf249..5c5884d7 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -6,13 +6,23 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
SUBARCH=s390
-SETS="openrc systemd_mu"
+SETS="
+ openrc
+ systemd_mu
+ openrc_23
+ systemd_23
+"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
update_symlinks() {
@@ -54,4 +64,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
+ ;;
+ esac
+ popd >/dev/null
}
[gentoo-commits] proj/releng:master commit in: tools/
commit: d1052880b98707f7b1de9843b1ea4b0380b3f4c2
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Jan 28 00:58:20 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Jan 28 00:58:20 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d1052880
sparc: Enable 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-sparc64.conf | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 3d1c6f79..24330c68 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -5,8 +5,30 @@ UPLOAD_USER=sparc
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
-SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1-mu.spec
sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec
sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
-OPTIONAL_SPECS="sparc64/installcd-stage1.spec
sparc64/installcd-stage2-minimal.spec"
+SETS="
+ openrc_32
+ systemd_32_mu
+ openrc_32_23
+ systemd_32_23
+ openrc_64
+ systemd_64_mu
+ openrc_64_23
+ systemd_64_23
+"
+
+SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
+SET_systemd_32_mu_SPECS="sparc/systemd-stage1-mu.spec
sparc/systemd-stage3-mu.spec"
+
+SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
+SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec
sparc64/installcd-stage2-minimal.spec"
+SET_systemd_64_mu_SPECS="sparc64/systemd-stage1-mu.spec
sparc64/systemd-stage3-mu.spec"
+
+SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec
sparc/stage3-openrc-23.spec"
+SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec
sparc/stage3-systemd-23.spec"
+
+SET_openrc_64_23_SPECS="sparc64/stage1-openrc-23.spec
sparc64/stage3-openrc-23.spec"
+SET_systemd_64_23_SPECS="sparc64/stage1-systemd-23.spec
sparc64/stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
@@ -49,6 +71,17 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ sparc/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc" sparc/23.0/32
+ ;;
+ sparc64/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
sparc/systemd-stage3-mu.spec)
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/x86/i686/, releases/specs/x86/i486/
commit: 7e5acd85c46e94742e7121b74834d42d774a9180
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Jan 24 20:40:19 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Jan 24 20:40:38 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7e5acd85
Drop x86 systemd split-usr builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/x86/i486/stage1-systemd.spec | 12
releases/specs/x86/i486/stage3-systemd.spec | 11 ---
releases/specs/x86/i686/stage1-systemd.spec | 12
releases/specs/x86/i686/stage3-systemd.spec | 11 ---
tools/catalyst-auto-x86.conf| 2 +-
5 files changed, 1 insertion(+), 47 deletions(-)
diff --git a/releases/specs/x86/i486/stage1-systemd.spec
b/releases/specs/x86/i486/stage1-systemd.spec
deleted file mode 100644
index f8c5f051..
--- a/releases/specs/x86/i486/stage1-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: i486
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-i486-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/i486/stage3-systemd.spec
b/releases/specs/x86/i486/stage3-systemd.spec
deleted file mode 100644
index ca8dce0c..
--- a/releases/specs/x86/i486/stage3-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i486
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i486-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-binrepo_path: x86/binpackages/17.0/i486
diff --git a/releases/specs/x86/i686/stage1-systemd.spec
b/releases/specs/x86/i686/stage1-systemd.spec
deleted file mode 100644
index 86ddf4ba..
--- a/releases/specs/x86/i686/stage1-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: i686
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: 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-systemd.spec
b/releases/specs/x86/i686/stage3-systemd.spec
deleted file mode 100644
index 3a5de590..
--- a/releases/specs/x86/i686/stage3-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i686
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i686-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-binrepo_path: x86/binpackages/17.0/i686
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index fa9f9b73..c30fd4f4 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -38,7 +38,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl,mergedusr}
; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null || exit
shopt -s extglob
[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/
commit: 937e558b18eca81b0db57600ec4e8e777022d002 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Dec 25 17:06:33 2023 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Dec 25 17:06:33 2023 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=937e558b Update PPC LE build files and enable binpkg upload Signed-off-by: Andreas K. Hüttel gentoo.org> .../ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec | 1 - .../specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec | 1 - releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec| 12 releases/specs/ppc/ppc64le/stage1-systemd.spec | 12 .../ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec | 2 +- .../specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec | 2 +- releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec | 1 + releases/specs/ppc/ppc64le/stage3-openrc.spec | 1 + releases/specs/ppc/ppc64le/stage3-systemd-mu-power9le.spec | 1 + releases/specs/ppc/ppc64le/stage3-systemd-mu.spec | 1 + releases/specs/ppc/ppc64le/stage3-systemd-power9le.spec| 10 -- releases/specs/ppc/ppc64le/stage3-systemd.spec | 10 -- releases/specs/ppc/ppc64le/stage3d-openrc-power9le.spec| 1 + .../specs/ppc/ppc64le/stage3d-systemd-mu-power9le.spec | 1 + tools/catalyst-auto-ppc64le.conf | 14 -- 15 files changed, 12 insertions(+), 58 deletions(-) diff --git a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec index 6bfc533d..94632a30 100644 --- a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec +++ b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc-power9le.spec @@ -11,4 +11,3 @@ update_seed: yes update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec index 05f60976..cc9c8c8b 100644 --- a/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec @@ -11,4 +11,3 @@ update_seed: yes update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec b/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec deleted file mode 100644 index fbd7b119.. --- a/releases/specs/ppc/ppc64le/stage1-systemd-power9le.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: power9le -target: stage1 -version_stamp: systemd-@TIMESTAMP@ -rel_type: power9le -profile: default/linux/ppc64le/17.0/systemd -snapshot: @TIMESTAMP@ -source_subpath: power9le/stage3-power9le-systemd-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/ppc/ppc64le/stage1-systemd.spec b/releases/specs/ppc/ppc64le/stage1-systemd.spec deleted file mode 100644 index ab4c37ff.. --- a/releases/specs/ppc/ppc64le/stage1-systemd.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: ppc64le -target: stage1 -version_stamp: systemd-@TIMESTAMP@ -rel_type: default -profile: default/linux/ppc64le/17.0/systemd -snapshot: @TIMESTAMP@ -source_subpath: default/stage3-ppc64le-systemd-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec index e57844b7..7803fc1c 100644 --- a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec +++ b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc-power9le.spec @@ -8,4 +8,4 @@ source_subpath: power9le-musl-hardened/stage1-power9le-musl-hardened-openrc-@TIM compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng -repos: /var/db/repos/musl +binrepo_path: ppc/binpackages/17.0/power9le_musl_hardened diff --git a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec index fa9577a8..4a75c3c8 100644 --- a/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec +++ b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec @@ -8,4 +8,4 @@ source_subpath: musl-hardened/stage1-ppc64le-musl-hardened-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir:
[gentoo-commits] proj/releng:master commit in: tools/
commit: ad059f3264c7c339892c68fb6551da7e4e7d0026
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Dec 24 22:15:37 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Dec 24 22:15:37 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=ad059f32
Upload x86 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-x86.conf | 10 --
1 file changed, 10 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 38b49922..fa9f9b73 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -21,14 +21,10 @@ SETS="
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_systemd_SPECS="i486/stage1-systemd.spec i486/stage3-systemd.spec"
-
SET_i486_systemd_mu_SPECS="i486/stage1-systemd-mu.spec
i486/stage3-systemd-mu.spec"
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
-SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage3-systemd.spec"
-
SET_i686_systemd_mu_SPECS="i686/stage1-systemd-mu.spec
i686/stage3-systemd-mu.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
@@ -70,9 +66,6 @@ post_build() {
case ${spec} in
i486/stage3-openrc.spec)
upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
- ;;
- i486/stage3-systemd.spec)
- upload stage3-i486-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
;;
i486/installcd-stage2-minimal-openrc.spec)
@@ -80,9 +73,6 @@ post_build() {
;;
i686/stage3-openrc.spec)
upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
- ;;
- i686/stage3-systemd.spec)
- upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 78944c63846acd564965a5974c6d87507a2e3b64
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Dec 24 22:11:44 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Dec 24 22:11:44 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=78944c63
Upload sparc 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-sparc64.conf | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 878236f7..3d1c6f79 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -15,7 +15,7 @@ EMAIL_SUBJECT_PREPEND="[sparc-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-sparc-*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -40,16 +40,10 @@ post_build() {
;;
sparc/stage3.spec)
upload stage3-sparc-${TIMESTAMP}*.xz*
- ;;
- sparc/systemd-stage3.spec)
- upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
;;
sparc64/stage3.spec)
upload stage3-sparc64-${TIMESTAMP}*.xz*
- ;;
- sparc64/systemd-stage3.spec)
- upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: a9c2966b9bec3cce5d92e104d25a8e4975e8ab32
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Dec 24 22:08:16 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Dec 24 22:08:16 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=a9c2966b
Upload s390 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-s390.conf | 7 +--
tools/catalyst-auto-s390x.conf | 7 +--
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 1e46ab4a..a9cbf249 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -11,8 +11,6 @@ SETS="openrc systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@@ -20,7 +18,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -44,9 +42,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
;;
esac
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index baf4ca90..f4fe9d83 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -11,8 +11,6 @@ SETS="openrc systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@@ -20,7 +18,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -44,9 +42,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: d0363089734bd2085a1b1593cdbbb81ae15bf783
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 23 21:29:52 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 23 21:29:52 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d0363089
Upload mips 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-mips-common | 53 +---
1 file changed, 1 insertion(+), 52 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 4331e527..4a3b00f6 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -42,51 +42,37 @@ SETS_MULTI="
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec
stage3-mips2-o32-openrc.spec"
-SET_mips2_o32_systemd_SPECS="stage1-mips2-o32-systemd.spec
stage3-mips2-o32-systemd.spec"
SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec
stage3-mips2-o32-systemd-mu.spec"
SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec
stage3-mips2_softfloat-o32-openrc.spec"
-SET_mips2_softfloat_o32_systemd_SPECS="stage1-mips2_softfloat-o32-systemd.spec
stage3-mips2_softfloat-o32-systemd.spec"
SET_mips2_softfloat_o32_systemd_mu_SPECS="stage1-mips2_softfloat-o32-systemd-mu.spec
stage3-mips2_softfloat-o32-systemd-mu.spec"
SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec
stage3-mips2-o32-musl.spec"
SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec
stage3-mipsel2-o32-openrc.spec"
-SET_mipsel2_o32_systemd_SPECS="stage1-mipsel2-o32-systemd.spec
stage3-mipsel2-o32-systemd.spec"
SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec
stage3-mipsel2-o32-systemd-mu.spec"
SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec
stage3-mipsel2_softfloat-o32-openrc.spec"
-SET_mipsel2_softfloat_o32_systemd_SPECS="stage1-mipsel2_softfloat-o32-systemd.spec
stage3-mipsel2_softfloat-o32-systemd.spec"
SET_mipsel2_softfloat_o32_systemd_mu_SPECS="stage1-mipsel2_softfloat-o32-systemd-mu.spec
stage3-mipsel2_softfloat-o32-systemd-mu.spec"
SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec
stage3-mipsel2-o32-musl.spec"
-SET_mipsel3_o32_openrc_SPECS="stage1-mipsel3-o32-openrc.spec
stage3-mipsel3-o32-openrc.spec"
-SET_mipsel3_o32_systemd_SPECS="stage1-mipsel3-o32-systemd.spec
stage3-mipsel3-o32-systemd.spec"
-SET_mipsel3_o32_systemd_mu_SPECS="stage1-mipsel3-o32-systemd-mu.spec
stage3-mipsel3-o32-systemd-mu.spec"
-
SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec
stage3-mips3-n32-openrc.spec"
-SET_mips3_n32_systemd_SPECS="stage1-mips3-n32-systemd.spec
stage3-mips3-n32-systemd.spec"
SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec
stage3-mips3-n32-systemd-mu.spec"
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec
stage3-mipsel3-n32-openrc.spec"
-SET_mipsel3_n32_systemd_SPECS="stage1-mipsel3-n32-systemd.spec
stage3-mipsel3-n32-systemd.spec"
SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec
stage3-mipsel3-n32-systemd-mu.spec"
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
-SET_mips3_multilib_systemd_SPECS="stage1-mips3-multilib-systemd.spec
stage3-mips3-multilib-systemd.spec"
SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec
stage3-mips3-multilib-systemd-mu.spec"
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
-SET_mipsel3_multilib_systemd_SPECS="stage1-mipsel3-multilib-systemd.spec
stage3-mipsel3-multilib-systemd.spec"
SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec
stage3-mipsel3-multilib-systemd-mu.spec"
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec
stage3-mips3-n64-openrc.spec"
-SET_mips3_n64_systemd_SPECS="stage1-mips3-n64-systemd.spec
stage3-mips3-n64-systemd.spec"
SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec
stage3-mips3-n64-systemd-mu.spec"
SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec
stage3-mipsel3-n64-openrc.spec"
-SET_mipsel3_n64_systemd_SPECS="stage1-mipsel3-n64-systemd.spec
stage3-mipsel3-n64-systemd.spec"
SET_mipsel3_n64_systemd_mu_SPECS="stage1-mipsel3-n64-systemd-mu.spec
stage3-mipsel3-n64-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
@@ -95,7 +81,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -113,79 +99,42 @@ post_build(
[gentoo-commits] proj/releng:master commit in: tools/
commit: 94538cc032931f07c75796447d80583e9373e980
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 23 21:19:44 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 23 21:19:44 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=94538cc0
Minor m68k cleanups
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-qemu-m68k.conf
b/tools/catalyst-auto-qemu-m68k.conf
index b5051456..f2154c4a 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -11,19 +11,23 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/m68k
EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
- musl
openrc
systemd_mu
+ musl
openrc_23
systemd_23
"
+# musl_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+
SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-23.spec"
update_symlinks() {
@@ -61,10 +65,6 @@ post_build() {
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
popd >/dev/null
;;
- stage3-openrc-23.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
- popd >/dev/null
- ;;
stage3-systemd-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
[gentoo-commits] proj/releng:master commit in: tools/
commit: 092133aea365dc400fc38283cb5e340de3e6098c
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 23 21:16:42 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 23 21:16:42 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=092133ae
Upload loong 22.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-qemu-loong.conf
b/tools/catalyst-auto-qemu-loong.conf
index 06d36d59..415c3e32 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -18,13 +18,12 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
-
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -46,9 +45,6 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
upload stage3-loong-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-loong-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-loong" loong/22.0/loong
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: f8cd60f6eea424a411737a2391435a71747f2155
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 23 21:14:17 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 23 21:14:17 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f8cd60f6
Upload ia64 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-ia64.conf | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 76dd80e1..47c24f74 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -13,8 +13,6 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
@@ -22,7 +20,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -43,9 +41,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-ia64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 7da15b3bb344f21f0c8af73e41841016321bac77
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 23 21:11:15 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 23 21:11:15 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7da15b3b
Upload hppa 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-hppa.conf | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 0f397fb2..2cddc6c5 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -15,15 +15,11 @@ SETS="
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec netboot-hppa32.spec"
-SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec
hppa1.1/stage3-systemd.spec"
-
SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec
hppa1.1/stage3-systemd-mu.spec"
SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
-SET_hppa20_systemd_SPECS="hppa2.0/stage1-systemd.spec
hppa2.0/stage3-systemd.spec"
-
SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec
hppa2.0/stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
@@ -35,7 +31,7 @@ TMP_PATH=/var/tmp/catalyst/tmp
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for t in hppa1.1 hppa2.0; do
@@ -68,16 +64,10 @@ post_build() {
;;
hppa1.1/stage3-openrc.spec)
upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
- ;;
- hppa1.1/stage3-systemd.spec)
- upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
;;
hppa2.0/stage3-openrc.spec)
upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
- ;;
- hppa2.0/stage3-systemd.spec)
- upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 78665b1b63f74f1b8722ee69fc3f28fa0defa85a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 23 21:01:53 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 23 21:01:53 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=78665b1b
Add comment to amd64 config
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-amd64.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index f1da137f..40b97527 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -107,6 +107,7 @@ post_build() {
;;
nomultilib/stage3-openrc.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
[gentoo-commits] proj/releng:master commit in: tools/
commit: a72eb411125b32bc834533b7cb58be5e2e0f726a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Dec 23 20:56:36 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Dec 23 20:56:36 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=a72eb411
Upload alpha 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 6 --
1 file changed, 6 deletions(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf
b/tools/catalyst-auto-qemu-alpha.conf
index bc7964f7..cea886dc 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -10,9 +10,6 @@ SETS="openrc systemd_mu openrc23 systemd23"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -44,9 +41,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
;;
esac
[gentoo-commits] proj/releng:master commit in: tools/
commit: 65901c614cfb54924ed07b4540ea63fcf418000f Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Dec 22 00:38:46 2023 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Dec 22 00:38:46 2023 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=65901c61 Disable 23.0 musl builds until catalyst is ready /o\ Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-arm64.conf | 2 +- tools/catalyst-auto-qemu-m68k.conf | 1 - tools/catalyst-auto-qemu-riscv.conf | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index dcf46eb3..ac015b05 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -19,7 +19,7 @@ SETS=" llvm_openrc_23 llvm_systemd_23 " -# needs musl-1.2.4 stable: +# needs musl-1.2.4 stable and new catalyst logic # musl_23 # musl_hardened_23 # musl_llvm_23 diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf index 0a6615f8..b5051456 100644 --- a/tools/catalyst-auto-qemu-m68k.conf +++ b/tools/catalyst-auto-qemu-m68k.conf @@ -14,7 +14,6 @@ SETS=" musl openrc systemd_mu - musl_23 openrc_23 systemd_23 " diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 8cbe0e0b..bcf6ea2e 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -21,10 +21,8 @@ SETS=" multilib_systemd_mu lp64d_openrc_23 lp64d_systemd_23 - lp64d_musl_23 lp64_openrc_23 lp64_systemd_23 - lp64_musl_23 multilib_openrc_23 multilib_systemd_23 "
[gentoo-commits] proj/releng:master commit in: tools/
commit: dfa28b9cff90fa1582858c44e35a69e50ac36696 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Dec 15 22:22:08 2023 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Dec 15 22:22:08 2023 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=dfa28b9c Disable arm64 23.0 musl builds again (needs musl-1.2.4 stable) Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-arm64.conf | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 61c7d67f..dcf46eb3 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -18,10 +18,11 @@ SETS=" systemd_23 llvm_openrc_23 llvm_systemd_23 - musl_23 - musl_hardened_23 - musl_llvm_23 " +# needs musl-1.2.4 stable: +# musl_23 +# musl_hardened_23 +# musl_llvm_23 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec" SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
[gentoo-commits] proj/releng:master commit in: tools/
commit: 64fa328a3f38b51c702a01a56fffd65c46180a48
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Dec 15 21:27:32 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Dec 15 21:27:32 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=64fa328a
Enable arm64 23.0 profile builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-arm64.conf | 53 ++
1 file changed, 53 insertions(+)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index baba95af..61c7d67f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -14,6 +14,13 @@ SETS="
musl
musl_hardened
musl_llvm
+ openrc_23
+ systemd_23
+ llvm_openrc_23
+ llvm_systemd_23
+ musl_23
+ musl_hardened_23
+ musl_llvm_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
@@ -21,16 +28,30 @@ SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec
stage3d-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec
stage3d-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec
stage3d-systemd-23.spec"
+
SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec
llvm/stage3-systemd-mu.spec"
+SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
+
+SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
+
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
SET_musl_llvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec"
+SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
+
+SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec
musl-hardened/stage3-23.spec"
+
+SET_musl_llvm_23_SPECS="musl-llvm/stage1-23.spec musl-llvm/stage3-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
@@ -88,6 +109,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null
+ case ${spec} in
+ llvm/stage3-systemd-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-arm64" arm64/23.0/arm64_llvm
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" >/dev/null
case ${spec} in
llvm/stage3-systemd-mu.spec)
@@ -105,6 +134,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ case ${spec} in
+ musl/stage3-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-arm64" arm64/23.0/arm64_musl
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3.spec)
@@ -114,6 +151,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
+ case ${spec} in
+ musl-hardened/stage3-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-arm64"
arm64/23.0/arm64_musl_hardened
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3.spec)
@@ -122,4 +167,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-llvm" >/dev/null
+ case ${spec} in
+ musl-llvm/stage3-23.spec)
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-arm64"
arm64/23.0/arm64_musl_llvm
+ ;;
+ esac
+ popd >/dev/null
}
[gentoo-commits] proj/releng:master commit in: tools/
commit: 422d534d250f797843913c7d0fed6f1a6b1308ad Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Dec 15 19:27:34 2023 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Dec 15 19:27:34 2023 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=422d534d Drop arm64 systemd split-usr sets Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-arm64.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 0f152ca1..baba95af 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -8,8 +8,8 @@ SUBARCH=arm64 SETS=" openrc - llvm_openrc systemd_mu + llvm_openrc llvm_systemd_mu musl musl_hardened @@ -19,12 +19,10 @@ SETS=" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec" SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec stage3d-systemd.spec" SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec stage3d-systemd-mu.spec" SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec" -SET_llvm_systemd_SPECS="llvm/stage1-systemd.spec llvm/stage3-systemd.spec" SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec" SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
[gentoo-commits] proj/releng:master commit in: tools/
commit: f1f0eaa27cfeac2335a7c16575205e5e06222f6b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Dec 15 18:37:45 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Dec 15 18:37:45 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f1f0eaa2
Enable all m68k 23.0 builds
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 29 ++---
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-qemu-m68k.conf
b/tools/catalyst-auto-qemu-m68k.conf
index ed9f3b3e..0a6615f8 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -14,17 +14,23 @@ SETS="
musl
openrc
systemd_mu
+ musl_23
+ openrc_23
+ systemd_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -42,11 +48,6 @@ post_build() {
stage3-openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
- popd >/dev/null
- ;;
- stage3-systemd.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
popd >/dev/null
;;
@@ -61,6 +62,20 @@ post_build() {
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
popd >/dev/null
;;
+ stage3-openrc-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
+ popd >/dev/null
+ ;;
+ stage3-systemd-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
+ popd >/dev/null
+ ;;
+ stage3-musl-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-m68k_musl" m68k/23.0/m68k_musl
+ popd >/dev/null
+ ;;
*)
echo "Finished ${spec}"
;;
[gentoo-commits] proj/releng:master commit in: tools/
commit: d7b9850fe6e064909daf3b7117a5edcfc4c54090
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Dec 15 03:08:33 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Dec 15 03:08:33 2023 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7b9850f
Fix riscv binpkg upsync logic
Signed-off-by: Andreas K. Hüttel gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 5 -
1 file changed, 5 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index 5aa73f0b..8cbe0e0b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -85,11 +85,6 @@ post_build() {
stage3*openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e
's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
- popd >/dev/null
- ;;
- stage3*systemd.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e
's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_multilib"
riscv/20.0/rv64_multilib
