[gentoo-commits] proj/releng:consolidate-upload commit in: tools/

[Matt Turner]

commit:     22d3877eb4a7d7e7eb5c89269ae3bca660125df2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 23:00:32 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 23:00:32 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=22d3877e

tools: Correct ARM stage names

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 tools/catalyst-auto-arm.conf      | 8 ++++----
 tools/catalyst-auto-qemu-arm.conf | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 829ff4c5..49495a2c 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -79,10 +79,10 @@ post_build() {
                upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
                ;;
        armv6j/stage3-hardfloat.spec)
-               upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+               upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
                ;;
        armv6j/stage3-hardfloat-systemd.spec)
-               upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+               upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
                ;;
        armv7a/stage3.spec)
                upload stage3-armv7a-${TIMESTAMP}*.xz*
@@ -91,10 +91,10 @@ post_build() {
                upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
                ;;
        armv7a/stage3-hardfloat.spec)
-               upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
+               upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
                ;;
        armv7a/stage3-hardfloat-systemd.spec)
-               upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
+               upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
                ;;
        esac
 

diff --git a/tools/catalyst-auto-qemu-arm.conf 
b/tools/catalyst-auto-qemu-arm.conf
index 0e2d7826..e30178dc 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -80,10 +80,10 @@ post_build() {
                upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
                ;;
        armv6j/stage3-hardfloat.spec)
-               upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+               upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
                ;;
        armv6j/stage3-hardfloat-systemd.spec)
-               upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+               upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
                ;;
        armv7a/stage3.spec)
                upload stage3-armv7a-${TIMESTAMP}*.xz*
@@ -92,10 +92,10 @@ post_build() {
                upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
                ;;
        armv7a/stage3-hardfloat.spec)
-               upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
+               upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
                ;;
        armv7a/stage3-hardfloat-systemd.spec)
-               upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
+               upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
                ;;
        esac