Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:consolidate-upload commit in: tools/
Date: Sun, 31 Jan 2021 23:08:48
Message-Id: 1612134032.22d3877eb4a7d7e7eb5c89269ae3bca660125df2.mattst88@gentoo
1 commit: 22d3877eb4a7d7e7eb5c89269ae3bca660125df2
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 31 23:00:32 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 23:00:32 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=22d3877e
7
8 tools: Correct ARM stage names
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 tools/catalyst-auto-arm.conf | 8 ++++----
13 tools/catalyst-auto-qemu-arm.conf | 8 ++++----
14 2 files changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
17 index 829ff4c5..49495a2c 100644
18 --- a/tools/catalyst-auto-arm.conf
19 +++ b/tools/catalyst-auto-arm.conf
20 @@ -79,10 +79,10 @@ post_build() {
21 upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
22 ;;
23 armv6j/stage3-hardfloat.spec)
24 - upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
25 + upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
26 ;;
27 armv6j/stage3-hardfloat-systemd.spec)
28 - upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
29 + upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
30 ;;
31 armv7a/stage3.spec)
32 upload stage3-armv7a-${TIMESTAMP}*.xz*
33 @@ -91,10 +91,10 @@ post_build() {
34 upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
35 ;;
36 armv7a/stage3-hardfloat.spec)
37 - upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
38 + upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
39 ;;
40 armv7a/stage3-hardfloat-systemd.spec)
41 - upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
42 + upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
43 ;;
44 esac
45
46
47 diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
48 index 0e2d7826..e30178dc 100644
49 --- a/tools/catalyst-auto-qemu-arm.conf
50 +++ b/tools/catalyst-auto-qemu-arm.conf
51 @@ -80,10 +80,10 @@ post_build() {
52 upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
53 ;;
54 armv6j/stage3-hardfloat.spec)
55 - upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
56 + upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
57 ;;
58 armv6j/stage3-hardfloat-systemd.spec)
59 - upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
60 + upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
61 ;;
62 armv7a/stage3.spec)
63 upload stage3-armv7a-${TIMESTAMP}*.xz*
64 @@ -92,10 +92,10 @@ post_build() {
65 upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
66 ;;
67 armv7a/stage3-hardfloat.spec)
68 - upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
69 + upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
70 ;;
71 armv7a/stage3-hardfloat-systemd.spec)
72 - upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
73 + upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
74 ;;
75 esac