Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools/
Date: Sun, 31 Jan 2021 00:50:13
Message-Id: 1612050003.c157adaf1b2e98be09c32cb6aefe776c40ccebe1.mattst88@gentoo
1 commit: c157adaf1b2e98be09c32cb6aefe776c40ccebe1
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 23:30:16 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 23:40:03 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c157adaf
7
8 tools: Remove some uses of ARCH
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 tools/catalyst-auto-amd64.conf | 4 ++--
13 tools/catalyst-auto-arm.conf | 5 ++---
14 tools/catalyst-auto-qemu-arm.conf | 5 ++---
15 tools/catalyst-auto-qemu-riscv.conf | 5 ++---
16 tools/catalyst-auto-x86.conf | 4 ++--
17 5 files changed, 10 insertions(+), 13 deletions(-)
18
19 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
20 index 20a1a80e..6ee56fb1 100644
21 --- a/tools/catalyst-auto-amd64.conf
22 +++ b/tools/catalyst-auto-amd64.conf
23 @@ -6,7 +6,7 @@ host=$(hostname)
24
25 source /etc/catalyst/release/build.env
26
27 -SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
28 +SPECS_DIR=${REPO_DIR}/releases/specs/amd64
29
30 SETS="
31 multilib minimal_multilib
32 @@ -38,7 +38,7 @@ SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage
33 #SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
34 SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
35
36 -KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
37 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
38
39 EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
40
41
42 diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
43 index 3a54dfa7..9f873c31 100644
44 --- a/tools/catalyst-auto-arm.conf
45 +++ b/tools/catalyst-auto-arm.conf
46 @@ -1,12 +1,11 @@
47 # This is the config file for the catalyst-auto script. It should be pretty
48 # self-explanatory.
49
50 -ARCH="arm"
51 host=$(hostname)
52
53 -SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
54 +SPECS_DIR=${REPO_DIR}/releases/specs/arm
55
56 -EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
57 +EMAIL_SUBJECT_PREPEND="[arm-auto]"
58
59 SETS="
60 armv4tl
61
62 diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
63 index 0e3d06fa..a6d9cdd8 100644
64 --- a/tools/catalyst-auto-qemu-arm.conf
65 +++ b/tools/catalyst-auto-qemu-arm.conf
66 @@ -1,12 +1,11 @@
67 # This is the config file for the catalyst-auto script. It should be pretty
68 # self-explanatory.
69
70 -ARCH="arm"
71 host=$(hostname)
72
73 -SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
74 +SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
75
76 -EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]"
77 +EMAIL_SUBJECT_PREPEND="[arm-qemu-auto]"
78
79 SETS="
80 armv4tl
81
82 diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
83 index 03d014b9..89c40b79 100644
84 --- a/tools/catalyst-auto-qemu-riscv.conf
85 +++ b/tools/catalyst-auto-qemu-riscv.conf
86 @@ -1,12 +1,11 @@
87 # This is the config file for the catalyst-auto script. It should be pretty
88 # self-explanatory.
89
90 -ARCH="riscv"
91 host=$(hostname)
92
93 -SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
94 +SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
95
96 -EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]"
97 +EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
98
99 SETS="
100 multilib
101
102 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
103 index 5a406782..e28131fc 100644
104 --- a/tools/catalyst-auto-x86.conf
105 +++ b/tools/catalyst-auto-x86.conf
106 @@ -6,7 +6,7 @@ host=$(hostname)
107
108 source /etc/catalyst/release/build.env
109
110 -SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
111 +SPECS_DIR=${REPO_DIR}/releases/specs/x86
112
113 SETS="
114 i486
115 @@ -25,7 +25,7 @@ SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/s
116 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
117 SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
118
119 -KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
120 +KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
121
122 EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"