From c157adaf1b2e98be09c32cb6aefe776c40ccebe1 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Sat, 30 Jan 2021 18:30:16 -0500
Subject: [PATCH] tools: Remove some uses of ARCH

Signed-off-by: Matt Turner <mattst88@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)"