From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5D906158041 for ; Wed, 27 Mar 2024 13:25:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FEC4E2A49; Wed, 27 Mar 2024 13:25:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54030E2A49 for ; Wed, 27 Mar 2024 13:25:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C96B33BEE8 for ; Wed, 27 Mar 2024 13:25:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3862B29 for ; Wed, 27 Mar 2024 13:25:31 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1711545906.9b41e1a51292a264959347d35ec1b35f7b1dd03f.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-s390x.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 9b41e1a51292a264959347d35ec1b35f7b1dd03f X-VCS-Branch: master Date: Wed, 27 Mar 2024 13:25:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3432d6d3-d85f-4af3-8343-2b31b5aa335e X-Archives-Hash: 2e8c4da53329b3ccf5a5e829cce0b086 commit: 9b41e1a51292a264959347d35ec1b35f7b1dd03f Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Mar 27 13:25:06 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Mar 27 13:25:06 2024 +0000 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 }