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 C9EFB158015 for ; Sun, 24 Dec 2023 22:08:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0520E2BC017; Sun, 24 Dec 2023 22:08:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 DC0062BC017 for ; Sun, 24 Dec 2023 22:08:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15825335DCC for ; Sun, 24 Dec 2023 22:08:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 880F0105D for ; Sun, 24 Dec 2023 22:08:49 +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: <1703455696.a9c2966b9bec3cce5d92e104d25a8e4975e8ab32.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: a9c2966b9bec3cce5d92e104d25a8e4975e8ab32 X-VCS-Branch: master Date: Sun, 24 Dec 2023 22:08:49 +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: 9a896cfd-a517-4089-b3b9-fc6b41e6607c X-Archives-Hash: 7026c4ed4c11b134f3e4972dc7d1576d commit: a9c2966b9bec3cce5d92e104d25a8e4975e8ab32 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Dec 24 22:08:16 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Dec 24 22:08:16 2023 +0000 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