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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A814E1382C5 for ; Sun, 31 Jan 2021 00:50:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99295E090E; Sun, 31 Jan 2021 00:50:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 810FAE090E for ; Sun, 31 Jan 2021 00:50:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABB67340C98 for ; Sun, 31 Jan 2021 00:50:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24E0E4A8 for ; Sun, 31 Jan 2021 00:50:09 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1612050003.c157adaf1b2e98be09c32cb6aefe776c40ccebe1.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-amd64.conf tools/catalyst-auto-arm.conf tools/catalyst-auto-qemu-arm.conf tools/catalyst-auto-qemu-riscv.conf tools/catalyst-auto-x86.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c157adaf1b2e98be09c32cb6aefe776c40ccebe1 X-VCS-Branch: master Date: Sun, 31 Jan 2021 00:50:09 +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: 8273e369-89bd-43f5-802d-ec1d57300927 X-Archives-Hash: 0d23b8f9fc009354ae6c12272a6d538e commit: c157adaf1b2e98be09c32cb6aefe776c40ccebe1 Author: Matt Turner gentoo org> AuthorDate: Sat Jan 30 23:30:16 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Jan 30 23:40:03 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c157adaf tools: Remove some uses of ARCH Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto-amd64.conf | 4 ++-- tools/catalyst-auto-arm.conf | 5 ++--- tools/catalyst-auto-qemu-arm.conf | 5 ++--- tools/catalyst-auto-qemu-riscv.conf | 5 ++--- tools/catalyst-auto-x86.conf | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 20a1a80e..6ee56fb1 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -6,7 +6,7 @@ host=$(hostname) source /etc/catalyst/release/build.env -SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH} +SPECS_DIR=${REPO_DIR}/releases/specs/amd64 SETS=" multilib minimal_multilib @@ -38,7 +38,7 @@ SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage #SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec" SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec" -KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH} +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64 EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index 3a54dfa7..9f873c31 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -1,12 +1,11 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -ARCH="arm" host=$(hostname) -SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH} +SPECS_DIR=${REPO_DIR}/releases/specs/arm -EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]" +EMAIL_SUBJECT_PREPEND="[arm-auto]" SETS=" armv4tl diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf index 0e3d06fa..a6d9cdd8 100644 --- a/tools/catalyst-auto-qemu-arm.conf +++ b/tools/catalyst-auto-qemu-arm.conf @@ -1,12 +1,11 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -ARCH="arm" host=$(hostname) -SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH} +SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm -EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]" +EMAIL_SUBJECT_PREPEND="[arm-qemu-auto]" SETS=" armv4tl diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 03d014b9..89c40b79 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -1,12 +1,11 @@ # This is the config file for the catalyst-auto script. It should be pretty # self-explanatory. -ARCH="riscv" host=$(hostname) -SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH} +SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv -EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]" +EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]" SETS=" multilib diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 5a406782..e28131fc 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -6,7 +6,7 @@ host=$(hostname) source /etc/catalyst/release/build.env -SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH} +SPECS_DIR=${REPO_DIR}/releases/specs/x86 SETS=" i486 @@ -25,7 +25,7 @@ SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/s SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" -KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH} +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86 EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"