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 43A55158020 for ; Wed, 23 Nov 2022 22:55:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74874E09D9; Wed, 23 Nov 2022 22:55:06 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 525D9E09D9 for ; Wed, 23 Nov 2022 22:55:06 +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 2B771340EE3 for ; Wed, 23 Nov 2022 22:55:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C360477 for ; Wed, 23 Nov 2022 22:55:03 +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: <1669244021.cd55ba6a335dc423ddf032c91bb5b857a6068c6c.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/m68k/ X-VCS-Repository: proj/releng X-VCS-Files: releases/specs-qemu/m68k/stage1-systemd-mu.spec releases/specs-qemu/m68k/stage3-systemd-mu.spec tools/catalyst-auto-qemu-m68k.conf X-VCS-Directories: releases/specs-qemu/m68k/ tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: cd55ba6a335dc423ddf032c91bb5b857a6068c6c X-VCS-Branch: master Date: Wed, 23 Nov 2022 22:55:03 +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: 396795b6-abc2-479e-8ad5-663311a37951 X-Archives-Hash: 8a30401715b97c4fc895f9cdca8d2d4c commit: cd55ba6a335dc423ddf032c91bb5b857a6068c6c Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Nov 23 22:53:41 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Nov 23 22:53:41 2022 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cd55ba6a Move m68k merged-usr builds to separate build types Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs-qemu/m68k/stage1-systemd-mu.spec | 4 ++-- releases/specs-qemu/m68k/stage3-systemd-mu.spec | 4 ++-- tools/catalyst-auto-qemu-m68k.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/releases/specs-qemu/m68k/stage1-systemd-mu.spec b/releases/specs-qemu/m68k/stage1-systemd-mu.spec index ae5ec941..dae9c234 100644 --- a/releases/specs-qemu/m68k/stage1-systemd-mu.spec +++ b/releases/specs-qemu/m68k/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: m68k version_stamp: systemd-mergedusr-@TIMESTAMP@ target: stage1 -rel_type: default +rel_type: mergedusr profile: default/linux/m68k/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-m68k-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-m68k-systemd-mergedusr-latest compression_mode: pixz update_seed: no update_seed_command: -uDN @world diff --git a/releases/specs-qemu/m68k/stage3-systemd-mu.spec b/releases/specs-qemu/m68k/stage3-systemd-mu.spec index 527b2056..aef1ca26 100644 --- a/releases/specs-qemu/m68k/stage3-systemd-mu.spec +++ b/releases/specs-qemu/m68k/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: m68k version_stamp: systemd-mergedusr-@TIMESTAMP@ target: stage3 -rel_type: default +rel_type: mergedusr profile: default/linux/m68k/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-m68k-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-m68k-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages-qemu portage_prefix: releng diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf index 96158c71..868a27f6 100644 --- a/tools/catalyst-auto-qemu-m68k.conf +++ b/tools/catalyst-auto-qemu-m68k.conf @@ -23,7 +23,7 @@ SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do @@ -49,7 +49,7 @@ post_build() { popd >/dev/null ;; stage3-systemd-mu.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz* popd >/dev/null ;;