Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools/
Date: Tue, 29 Nov 2022 20:33:56
Message-Id: 1669754010.c59bff47837f3343d0b3e7d00be9bc550fc345a6.dilfridge@gentoo
1 commit: c59bff47837f3343d0b3e7d00be9bc550fc345a6
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 29 20:33:30 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 29 20:33:30 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c59bff47
7
8 Add debug output to s390(x) netboot upload
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 tools/catalyst-auto-s390.conf | 7 ++++---
13 tools/catalyst-auto-s390x.conf | 7 ++++---
14 2 files changed, 8 insertions(+), 6 deletions(-)
15
16 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
17 index 2b9a505b..2f7ee79e 100644
18 --- a/tools/catalyst-auto-s390.conf
19 +++ b/tools/catalyst-auto-s390.conf
20 @@ -37,9 +37,10 @@ post_build() {
21 pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
22 case ${spec} in
23 netboot/netboot.spec)
24 - mv netboot2-s390-${TIMESTAMP}/kernels/netboot netboot2-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
25 - mv netboot2-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot2-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
26 - upload netboot2-s390-${TIMESTAMP}/netboot*
27 + ls -l netboot-s390-${TIMESTAMP}/kernels/
28 + mv -v netboot-s390-${TIMESTAMP}/kernels/netboot netboot-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
29 + mv -v netboot-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
30 + upload netboot-s390-${TIMESTAMP}/netboot*
31 ;;
32 stage3-openrc.spec)
33 upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
34
35 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
36 index 0c3b6f10..01a04fb0 100644
37 --- a/tools/catalyst-auto-s390x.conf
38 +++ b/tools/catalyst-auto-s390x.conf
39 @@ -37,9 +37,10 @@ post_build() {
40 pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
41 case ${spec} in
42 netboot/netboot.spec)
43 - mv netboot2-s390x-${TIMESTAMP}/kernels/netboot64 netboot2-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
44 - mv netboot2-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
45 - upload netboot2-s390x-${TIMESTAMP}/netboot*
46 + ls -l netboot-s390x-${TIMESTAMP}/
47 + mv -v netboot-s390x-${TIMESTAMP}/kernels/netboot64 netboot-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
48 + mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
49 + upload netboot-s390x-${TIMESTAMP}/netboot*
50 ;;
51 stage3-openrc.spec)
52 upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*