1 |
commit: 635cc00fa9ca3d2abf61a5ca11aafcdc72547489 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 9 20:43:43 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 9 20:58:42 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=635cc00f |
7 |
|
8 |
tools: Combine arm configs |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
tools/catalyst-auto-arm.conf | 51 ++++++++++++++++++++++++++++++++++ |
13 |
tools/catalyst-auto-armv4tl.conf | 34 ----------------------- |
14 |
tools/catalyst-auto-armv5tel.conf | 34 ----------------------- |
15 |
tools/catalyst-auto-armv6j.conf | 34 ----------------------- |
16 |
tools/catalyst-auto-armv6j_hardfp.conf | 34 ----------------------- |
17 |
tools/catalyst-auto-armv7a.conf | 34 ----------------------- |
18 |
tools/catalyst-auto-armv7a_hardfp.conf | 34 ----------------------- |
19 |
7 files changed, 51 insertions(+), 204 deletions(-) |
20 |
|
21 |
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf |
22 |
new file mode 100644 |
23 |
index 00000000..96d75326 |
24 |
--- /dev/null |
25 |
+++ b/tools/catalyst-auto-arm.conf |
26 |
@@ -0,0 +1,51 @@ |
27 |
+# This is the config file for the catalyst-auto script. It should be pretty |
28 |
+# self-explanatory. |
29 |
+ |
30 |
+REPO_DIR=/root/releng/ |
31 |
+ |
32 |
+SPECS_DIR=${REPO_DIR}/releases/specs/arm |
33 |
+ |
34 |
+SPECS="armv4tl/stage1.spec armv4tl/stage3.spec armv5tel/stage1.spec armv5tel/stage3.spec armv6j/hardfloat/stage1.spec armv6j/hardfloat/stage3.spec armv7a/hardfloat/stage1.spec armv7a/hardfloat/stage3.spec" |
35 |
+ |
36 |
+EMAIL_SUBJECT_PREPEND="[arm-auto]" |
37 |
+ |
38 |
+update_symlinks() { |
39 |
+ # Symlink the latest stages3 to build from |
40 |
+ for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
41 |
+ pushd $d >/dev/null |
42 |
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do |
43 |
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
44 |
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
45 |
+ ln -sf $f $of |
46 |
+ done |
47 |
+ popd >/dev/null |
48 |
+ done |
49 |
+} |
50 |
+ |
51 |
+ |
52 |
+upload() { |
53 |
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@××××××××××××××××××××××.org: |
54 |
+} |
55 |
+ |
56 |
+post_build() { |
57 |
+ local set=$1 spec=$2 |
58 |
+ |
59 |
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null |
60 |
+ |
61 |
+ case ${spec} in |
62 |
+ armv4tl/stage3.spec) |
63 |
+ upload stage3-armv4tl-${TIMESTAMP}*.xz* |
64 |
+ ;; |
65 |
+ armv5tel/systemd-stage3.spec) |
66 |
+ upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* |
67 |
+ ;; |
68 |
+ armv6j_hardfp/stage3.spec) |
69 |
+ upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz* |
70 |
+ ;; |
71 |
+ armv7a_hardfp/stage3.spec) |
72 |
+ upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz* |
73 |
+ ;; |
74 |
+ esac |
75 |
+ |
76 |
+ popd >/dev/null |
77 |
+} |
78 |
|
79 |
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf |
80 |
deleted file mode 100644 |
81 |
index e09b6cb8..00000000 |
82 |
--- a/tools/catalyst-auto-armv4tl.conf |
83 |
+++ /dev/null |
84 |
@@ -1,34 +0,0 @@ |
85 |
-# This is the config file for the catalyst-auto script. It should be pretty |
86 |
-# self-explanatory. |
87 |
- |
88 |
-REPO_DIR=/root/releng/ |
89 |
- |
90 |
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv4tl |
91 |
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` |
92 |
- |
93 |
-SETS="default" |
94 |
- |
95 |
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec" |
96 |
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
97 |
- |
98 |
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc |
99 |
- |
100 |
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" |
101 |
- |
102 |
-update_symlinks() { |
103 |
- # Symlink the latest stages3 to build from |
104 |
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
105 |
- pushd $d >/dev/null |
106 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do |
107 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
108 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
109 |
- ln -sf $f $of |
110 |
- done |
111 |
- popd >/dev/null |
112 |
- done |
113 |
-} |
114 |
- |
115 |
- |
116 |
-post_build() { |
117 |
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org: |
118 |
-} |
119 |
|
120 |
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf |
121 |
deleted file mode 100644 |
122 |
index 8daef964..00000000 |
123 |
--- a/tools/catalyst-auto-armv5tel.conf |
124 |
+++ /dev/null |
125 |
@@ -1,34 +0,0 @@ |
126 |
-# This is the config file for the catalyst-auto script. It should be pretty |
127 |
-# self-explanatory. |
128 |
- |
129 |
-REPO_DIR=/root/releng/ |
130 |
- |
131 |
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv5tel |
132 |
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` |
133 |
- |
134 |
-SETS="default" |
135 |
- |
136 |
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec" |
137 |
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
138 |
- |
139 |
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc |
140 |
- |
141 |
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" |
142 |
- |
143 |
-update_symlinks() { |
144 |
- # Symlink the latest stages3 to build from |
145 |
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
146 |
- pushd $d >/dev/null |
147 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do |
148 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
149 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
150 |
- ln -sf $f $of |
151 |
- done |
152 |
- popd >/dev/null |
153 |
- done |
154 |
-} |
155 |
- |
156 |
- |
157 |
-post_build() { |
158 |
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org: |
159 |
-} |
160 |
|
161 |
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf |
162 |
deleted file mode 100644 |
163 |
index a1d52f5d..00000000 |
164 |
--- a/tools/catalyst-auto-armv6j.conf |
165 |
+++ /dev/null |
166 |
@@ -1,34 +0,0 @@ |
167 |
-# This is the config file for the catalyst-auto script. It should be pretty |
168 |
-# self-explanatory. |
169 |
- |
170 |
-REPO_DIR=/root/releng/ |
171 |
- |
172 |
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j |
173 |
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` |
174 |
- |
175 |
-SETS="default" |
176 |
- |
177 |
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec" |
178 |
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
179 |
- |
180 |
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc |
181 |
- |
182 |
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" |
183 |
- |
184 |
-update_symlinks() { |
185 |
- # Symlink the latest stages3 to build from |
186 |
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
187 |
- pushd $d >/dev/null |
188 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do |
189 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
190 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
191 |
- ln -sf $f $of |
192 |
- done |
193 |
- popd >/dev/null |
194 |
- done |
195 |
-} |
196 |
- |
197 |
- |
198 |
-post_build() { |
199 |
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org: |
200 |
-} |
201 |
|
202 |
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf |
203 |
deleted file mode 100644 |
204 |
index 50bf09f7..00000000 |
205 |
--- a/tools/catalyst-auto-armv6j_hardfp.conf |
206 |
+++ /dev/null |
207 |
@@ -1,34 +0,0 @@ |
208 |
-# This is the config file for the catalyst-auto script. It should be pretty |
209 |
-# self-explanatory. |
210 |
- |
211 |
-REPO_DIR=/root/releng/ |
212 |
- |
213 |
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j/hardfloat |
214 |
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` |
215 |
- |
216 |
-SETS="default" |
217 |
- |
218 |
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec" |
219 |
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
220 |
- |
221 |
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc |
222 |
- |
223 |
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" |
224 |
- |
225 |
-update_symlinks() { |
226 |
- # Symlink the latest stages3 to build from |
227 |
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
228 |
- pushd $d >/dev/null |
229 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do |
230 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
231 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
232 |
- ln -sf $f $of |
233 |
- done |
234 |
- popd >/dev/null |
235 |
- done |
236 |
-} |
237 |
- |
238 |
- |
239 |
-post_build() { |
240 |
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org: |
241 |
-} |
242 |
|
243 |
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf |
244 |
deleted file mode 100644 |
245 |
index a4def3c7..00000000 |
246 |
--- a/tools/catalyst-auto-armv7a.conf |
247 |
+++ /dev/null |
248 |
@@ -1,34 +0,0 @@ |
249 |
-# This is the config file for the catalyst-auto script. It should be pretty |
250 |
-# self-explanatory. |
251 |
- |
252 |
-REPO_DIR=/root/releng/ |
253 |
- |
254 |
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a |
255 |
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` |
256 |
- |
257 |
-SETS="default" |
258 |
- |
259 |
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec" |
260 |
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
261 |
- |
262 |
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc |
263 |
- |
264 |
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" |
265 |
- |
266 |
-update_symlinks() { |
267 |
- # Symlink the latest stages3 to build from |
268 |
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
269 |
- pushd $d >/dev/null |
270 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do |
271 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
272 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
273 |
- ln -sf $f $of |
274 |
- done |
275 |
- popd >/dev/null |
276 |
- done |
277 |
-} |
278 |
- |
279 |
- |
280 |
-post_build() { |
281 |
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org: |
282 |
-} |
283 |
|
284 |
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf |
285 |
deleted file mode 100644 |
286 |
index ce7904a5..00000000 |
287 |
--- a/tools/catalyst-auto-armv7a_hardfp.conf |
288 |
+++ /dev/null |
289 |
@@ -1,34 +0,0 @@ |
290 |
-# This is the config file for the catalyst-auto script. It should be pretty |
291 |
-# self-explanatory. |
292 |
- |
293 |
-REPO_DIR=/root/releng/ |
294 |
- |
295 |
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a/hardfloat |
296 |
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` |
297 |
- |
298 |
-SETS="default" |
299 |
- |
300 |
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec" |
301 |
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
302 |
- |
303 |
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc |
304 |
- |
305 |
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" |
306 |
- |
307 |
-update_symlinks() { |
308 |
- # Symlink the latest stages3 to build from |
309 |
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
310 |
- pushd $d >/dev/null |
311 |
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do |
312 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
313 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $ |
314 |
- ln -sf $f $of |
315 |
- done |
316 |
- popd >/dev/null |
317 |
- done |
318 |
-} |
319 |
- |
320 |
- |
321 |
-post_build() { |
322 |
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org: |
323 |
-} |