tools: Remove some uses of ARCH

Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner 2021-01-30 18:30:16 -05:00
parent c6404520ed
commit c157adaf1b
5 changed files with 10 additions and 13 deletions

View file

@ -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)"

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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)"