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: releases/specs-qemu/riscv/, tools/
Date: Sat, 21 Aug 2021 21:53:14
Message-Id: 1629582334.adfc9e915ee5b91d894a9f435ecfbece1f158b9e.dilfridge@gentoo
1 commit: adfc9e915ee5b91d894a9f435ecfbece1f158b9e
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 21 21:45:34 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 21 21:45:34 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=adfc9e91
7
8 Rename riscv stage names to drop profile version
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 ...64-20.0-openrc.spec => stage1-lp64-openrc.spec} | 0
13 ...-20.0-systemd.spec => stage1-lp64-systemd.spec} | 0
14 ...d-20.0-openrc.spec => stage1-lp64d-openrc.spec} | 0
15 ...20.0-systemd.spec => stage1-lp64d-systemd.spec} | 0
16 ...0.0-openrc.spec => stage1-multilib-openrc.spec} | 0
17 ...0-systemd.spec => stage1-multilib-systemd.spec} | 0
18 ...64-20.0-openrc.spec => stage3-lp64-openrc.spec} | 0
19 ...-20.0-systemd.spec => stage3-lp64-systemd.spec} | 0
20 ...d-20.0-openrc.spec => stage3-lp64d-openrc.spec} | 0
21 ...20.0-systemd.spec => stage3-lp64d-systemd.spec} | 0
22 ...0.0-openrc.spec => stage3-multilib-openrc.spec} | 0
23 ...0-systemd.spec => stage3-multilib-systemd.spec} | 0
24 tools/catalyst-auto-qemu-riscv.conf | 24 +++++++++++-----------
25 13 files changed, 12 insertions(+), 12 deletions(-)
26
27 diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec b/releases/specs-qemu/riscv/stage1-lp64-openrc.spec
28 similarity index 100%
29 rename from releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec
30 rename to releases/specs-qemu/riscv/stage1-lp64-openrc.spec
31
32 diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
33 similarity index 100%
34 rename from releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec
35 rename to releases/specs-qemu/riscv/stage1-lp64-systemd.spec
36
37 diff --git a/releases/specs-qemu/riscv/stage1-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage1-lp64d-openrc.spec
38 similarity index 100%
39 rename from releases/specs-qemu/riscv/stage1-lp64d-20.0-openrc.spec
40 rename to releases/specs-qemu/riscv/stage1-lp64d-openrc.spec
41
42 diff --git a/releases/specs-qemu/riscv/stage1-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
43 similarity index 100%
44 rename from releases/specs-qemu/riscv/stage1-lp64d-20.0-systemd.spec
45 rename to releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
46
47 diff --git a/releases/specs-qemu/riscv/stage1-multilib-20.0-openrc.spec b/releases/specs-qemu/riscv/stage1-multilib-openrc.spec
48 similarity index 100%
49 rename from releases/specs-qemu/riscv/stage1-multilib-20.0-openrc.spec
50 rename to releases/specs-qemu/riscv/stage1-multilib-openrc.spec
51
52 diff --git a/releases/specs-qemu/riscv/stage1-multilib-20.0-systemd.spec b/releases/specs-qemu/riscv/stage1-multilib-systemd.spec
53 similarity index 100%
54 rename from releases/specs-qemu/riscv/stage1-multilib-20.0-systemd.spec
55 rename to releases/specs-qemu/riscv/stage1-multilib-systemd.spec
56
57 diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64-openrc.spec
58 similarity index 100%
59 rename from releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec
60 rename to releases/specs-qemu/riscv/stage3-lp64-openrc.spec
61
62 diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
63 similarity index 100%
64 rename from releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec
65 rename to releases/specs-qemu/riscv/stage3-lp64-systemd.spec
66
67 diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
68 similarity index 100%
69 rename from releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec
70 rename to releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
71
72 diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
73 similarity index 100%
74 rename from releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec
75 rename to releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
76
77 diff --git a/releases/specs-qemu/riscv/stage3-multilib-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-multilib-openrc.spec
78 similarity index 100%
79 rename from releases/specs-qemu/riscv/stage3-multilib-20.0-openrc.spec
80 rename to releases/specs-qemu/riscv/stage3-multilib-openrc.spec
81
82 diff --git a/releases/specs-qemu/riscv/stage3-multilib-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-multilib-systemd.spec
83 similarity index 100%
84 rename from releases/specs-qemu/riscv/stage3-multilib-20.0-systemd.spec
85 rename to releases/specs-qemu/riscv/stage3-multilib-systemd.spec
86
87 diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
88 index 6a03879b..9d634695 100644
89 --- a/tools/catalyst-auto-qemu-riscv.conf
90 +++ b/tools/catalyst-auto-qemu-riscv.conf
91 @@ -11,20 +11,20 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
92 EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
93
94 SETS="
95 - lp64d_200_openrc
96 - lp64d_200_systemd
97 - lp64_200_openrc
98 - lp64_200_systemd
99 - multilib_200_openrc
100 - multilib_200_systemd
101 + lp64d_openrc
102 + lp64d_systemd
103 + lp64_openrc
104 + lp64_systemd
105 + multilib_openrc
106 + multilib_systemd
107 "
108
109 -SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
110 -SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
111 -SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec"
112 -SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-systemd.spec"
113 -SET_multilib_200_openrc_SPECS="stage1-multilib-20.0-openrc.spec stage3-multilib-20.0-openrc.spec"
114 -SET_multilib_200_systemd_SPECS="stage1-multilib-20.0-systemd.spec stage3-multilib-20.0-systemd.spec"
115 +SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
116 +SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
117 +SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
118 +SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
119 +SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec"
120 +SET_multilib_systemd_SPECS="stage1-multilib-systemd.spec stage3-multilib-systemd.spec"
121
122 update_symlinks() {
123 # Symlink the latest stages3 to build from