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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65D09158041 for ; Wed, 27 Mar 2024 13:11:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B123DE2A4B; Wed, 27 Mar 2024 13:11:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 87B78E2A4B for ; Wed, 27 Mar 2024 13:11:31 +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 BDE0C342FF8 for ; Wed, 27 Mar 2024 13:11:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 282EDB29 for ; Wed, 27 Mar 2024 13:11:29 +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: <1711545052.acbca0b011faf04a83c7e9e7d09a977ff2804586.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: acbca0b011faf04a83c7e9e7d09a977ff2804586 X-VCS-Branch: master Date: Wed, 27 Mar 2024 13:11:29 +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: 793c936e-eeed-4d1b-bdde-1959c66e48dc X-Archives-Hash: a800b6c68f7b5e5fbef518a4e51844ce commit: acbca0b011faf04a83c7e9e7d09a977ff2804586 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Mar 27 13:10:52 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Mar 27 13:10:52 2024 +0000 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