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 443B2158090 for ; Sun, 22 May 2022 21:39:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74778E0907; Sun, 22 May 2022 21:39:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 559B8E0907 for ; Sun, 22 May 2022 21:39:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2DD13341CC4 for ; Sun, 22 May 2022 21:39:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32545326 for ; Sun, 22 May 2022 21:39:44 +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: <1653255550.3e184dc0f7d813b182992267713e9521dcd564c7.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/s390/s390/netboot/, tools/, releases/specs/s390/s390/ X-VCS-Repository: proj/releng X-VCS-Files: releases/specs/s390/s390/netboot/netboot.spec releases/specs/s390/s390/stage1-openrc.spec releases/specs/s390/s390/stage1.spec releases/specs/s390/s390/stage3-openrc.spec releases/specs/s390/s390/stage3.spec tools/catalyst-auto-s390.conf X-VCS-Directories: tools/ releases/specs/s390/s390/ releases/specs/s390/s390/netboot/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 3e184dc0f7d813b182992267713e9521dcd564c7 X-VCS-Branch: master Date: Sun, 22 May 2022 21:39:44 +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: 1cac30e9-3900-4a3b-bfd2-7b39744074f7 X-Archives-Hash: 87174af95d7a859e49f6c0a82e6ccfc1 commit: 3e184dc0f7d813b182992267713e9521dcd564c7 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun May 22 21:39:10 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun May 22 21:39:10 2022 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3e184dc0 s390: update stage file and spec file names (openrc) Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/s390/s390/netboot/netboot.spec | 2 +- releases/specs/s390/s390/{stage1.spec => stage1-openrc.spec} | 4 ++-- releases/specs/s390/s390/{stage3.spec => stage3-openrc.spec} | 4 ++-- tools/catalyst-auto-s390.conf | 11 +++++------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/releases/specs/s390/s390/netboot/netboot.spec b/releases/specs/s390/s390/netboot/netboot.spec index 7c812446..8781426b 100644 --- a/releases/specs/s390/s390/netboot/netboot.spec +++ b/releases/specs/s390/s390/netboot/netboot.spec @@ -1,7 +1,7 @@ # S390 Netboot spec file, based in HPPA Netboot spec file by Guy Martin version_stamp: @TIMESTAMP@ snapshot: @TIMESTAMP@ -source_subpath: default/stage3-s390-@TIMESTAMP@ +source_subpath: default/stage3-s390-openrc-@TIMESTAMP@ pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-s390 # these shouldn't change diff --git a/releases/specs/s390/s390/stage1.spec b/releases/specs/s390/s390/stage1-openrc.spec similarity index 78% rename from releases/specs/s390/s390/stage1.spec rename to releases/specs/s390/s390/stage1-openrc.spec index 79544acb..4889d88c 100644 --- a/releases/specs/s390/s390/stage1.spec +++ b/releases/specs/s390/s390/stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: s390 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ target: stage1 rel_type: default profile: default/linux/s390/17.0 snapshot: @TIMESTAMP@ -source_subpath: default/stage3-s390-latest +source_subpath: default/stage3-s390-openrc-latest update_seed: yes update_seed_command: --update --deep --newuse @world compression_mode: pixz diff --git a/releases/specs/s390/s390/stage3.spec b/releases/specs/s390/s390/stage3-openrc.spec similarity index 72% rename from releases/specs/s390/s390/stage3.spec rename to releases/specs/s390/s390/stage3-openrc.spec index f615e864..91a8cb32 100644 --- a/releases/specs/s390/s390/stage3.spec +++ b/releases/specs/s390/s390/stage3-openrc.spec @@ -1,10 +1,10 @@ subarch: s390 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ target: stage3 rel_type: default profile: default/linux/s390/17.0 snapshot: @TIMESTAMP@ -source_subpath: default/stage1-s390-@TIMESTAMP@ +source_subpath: default/stage1-s390-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 3b8475ba..8722de98 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -6,11 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` -SETS="default netboot" +SETS="openrc" -SET_default_SPECS="stage1.spec stage3.spec" - -SET_netboot_SPECS="netboot/netboot.spec" +SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" +SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390 @@ -38,8 +37,8 @@ post_build() { mv netboot2-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot2-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP} upload netboot2-s390-${TIMESTAMP}/netboot* ;; - stage3.spec) - upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* + stage3-openrc.spec) + upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz* ;; *) echo "Finished ${spec}"