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/, releases/specs-qemu/mips/
Date: Sun, 27 Nov 2022 12:16:50
Message-Id: 1669551383.2e9169a86d58dbcbc5faa23509b838806d86db3b.dilfridge@gentoo
1 commit: 2e9169a86d58dbcbc5faa23509b838806d86db3b
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 27 12:16:23 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 12:16:23 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2e9169a8
7
8 Add mips BE systemd merged-usr builds
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 .../specs-qemu/mips/stage1-mips2-o32-systemd-mu.spec | 14 ++++++++++++++
13 .../mips/stage1-mips3-multilib-systemd-mu.spec | 14 ++++++++++++++
14 .../specs-qemu/mips/stage1-mips3-n32-systemd-mu.spec | 14 ++++++++++++++
15 .../specs-qemu/mips/stage1-mips3-n64-systemd-mu.spec | 14 ++++++++++++++
16 .../specs-qemu/mips/stage3-mips2-o32-systemd-mu.spec | 12 ++++++++++++
17 .../mips/stage3-mips3-multilib-systemd-mu.spec | 12 ++++++++++++
18 .../specs-qemu/mips/stage3-mips3-n32-systemd-mu.spec | 12 ++++++++++++
19 .../specs-qemu/mips/stage3-mips3-n64-systemd-mu.spec | 12 ++++++++++++
20 tools/catalyst-auto-qemu-mips-common | 20 ++++++++++++++++++++
21 9 files changed, 124 insertions(+)
22
23 diff --git a/releases/specs-qemu/mips/stage1-mips2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips2-o32-systemd-mu.spec
24 new file mode 100644
25 index 00000000..7a48584c
26 --- /dev/null
27 +++ b/releases/specs-qemu/mips/stage1-mips2-o32-systemd-mu.spec
28 @@ -0,0 +1,14 @@
29 +subarch: mips2
30 +target: stage1
31 +version_stamp: systemd-mergedusr-@TIMESTAMP@
32 +interpreter: /usr/bin/qemu-mips
33 +rel_type: mergedusr
34 +profile: default/linux/mips/17.0/o32/systemd/merged-usr
35 +snapshot: @TIMESTAMP@
36 +source_subpath: mergedusr/stage3-mips2-systemd-mergedusr-latest
37 +compression_mode: pixz
38 +decompressor_search_order: xz bzip2
39 +update_seed: no
40 +update_seed_command: -uDN @world
41 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
42 +portage_prefix: releng
43
44 diff --git a/releases/specs-qemu/mips/stage1-mips3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips3-multilib-systemd-mu.spec
45 new file mode 100644
46 index 00000000..7f63e69f
47 --- /dev/null
48 +++ b/releases/specs-qemu/mips/stage1-mips3-multilib-systemd-mu.spec
49 @@ -0,0 +1,14 @@
50 +subarch: mips3_multilib
51 +target: stage1
52 +version_stamp: systemd-mergedusr-@TIMESTAMP@
53 +interpreter: /usr/bin/qemu-mipsn32 /usr/bin/qemu-mips /usr/bin/qemu-mips64
54 +rel_type: mergedusr
55 +profile: default/linux/mips/17.0/multilib/n32/systemd/merged-usr
56 +snapshot: @TIMESTAMP@
57 +source_subpath: mergedusr/stage3-mips3_multilib-systemd-mergedusr-latest
58 +compression_mode: pixz
59 +decompressor_search_order: xz bzip2
60 +update_seed: no
61 +update_seed_command: -uDN @world
62 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
63 +portage_prefix: releng
64
65 diff --git a/releases/specs-qemu/mips/stage1-mips3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips3-n32-systemd-mu.spec
66 new file mode 100644
67 index 00000000..82a3f661
68 --- /dev/null
69 +++ b/releases/specs-qemu/mips/stage1-mips3-n32-systemd-mu.spec
70 @@ -0,0 +1,14 @@
71 +subarch: mips3_n32
72 +target: stage1
73 +version_stamp: systemd-mergedusr-@TIMESTAMP@
74 +interpreter: /usr/bin/qemu-mipsn32
75 +rel_type: mergedusr
76 +profile: default/linux/mips/17.0/n32/systemd/merged-usr
77 +snapshot: @TIMESTAMP@
78 +source_subpath: mergedusr/stage3-mips3_n32-systemd-mergedusr-latest
79 +compression_mode: pixz
80 +decompressor_search_order: xz bzip2
81 +update_seed: no
82 +update_seed_command: -uDN @world
83 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
84 +portage_prefix: releng
85
86 diff --git a/releases/specs-qemu/mips/stage1-mips3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips3-n64-systemd-mu.spec
87 new file mode 100644
88 index 00000000..967a8d2f
89 --- /dev/null
90 +++ b/releases/specs-qemu/mips/stage1-mips3-n64-systemd-mu.spec
91 @@ -0,0 +1,14 @@
92 +subarch: mips3_n64
93 +target: stage1
94 +version_stamp: systemd-mergedusr-@TIMESTAMP@
95 +interpreter: /usr/bin/qemu-mips64
96 +rel_type: mergedusr
97 +profile: default/linux/mips/17.0/n64/systemd/merged-usr
98 +snapshot: @TIMESTAMP@
99 +source_subpath: mergedusr/stage3-mips3_n64-systemd-mergedusr-latest
100 +compression_mode: pixz
101 +decompressor_search_order: xz bzip2
102 +update_seed: no
103 +update_seed_command: -uDN @world
104 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
105 +portage_prefix: releng
106
107 diff --git a/releases/specs-qemu/mips/stage3-mips2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips2-o32-systemd-mu.spec
108 new file mode 100644
109 index 00000000..d816602c
110 --- /dev/null
111 +++ b/releases/specs-qemu/mips/stage3-mips2-o32-systemd-mu.spec
112 @@ -0,0 +1,12 @@
113 +subarch: mips2
114 +target: stage3
115 +version_stamp: systemd-mergedusr-@TIMESTAMP@
116 +interpreter: /usr/bin/qemu-mips
117 +rel_type: mergedusr
118 +profile: default/linux/mips/17.0/o32/systemd/merged-usr
119 +snapshot: @TIMESTAMP@
120 +source_subpath: mergedusr/stage1-mips2-systemd-mergedusr-@TIMESTAMP@
121 +compression_mode: pixz
122 +decompressor_search_order: xz bzip2
123 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
124 +portage_prefix: releng
125
126 diff --git a/releases/specs-qemu/mips/stage3-mips3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips3-multilib-systemd-mu.spec
127 new file mode 100644
128 index 00000000..71847360
129 --- /dev/null
130 +++ b/releases/specs-qemu/mips/stage3-mips3-multilib-systemd-mu.spec
131 @@ -0,0 +1,12 @@
132 +subarch: mips3_multilib
133 +target: stage3
134 +version_stamp: systemd-mergedusr-@TIMESTAMP@
135 +interpreter: /usr/bin/qemu-mipsn32 /usr/bin/qemu-mips /usr/bin/qemu-mips64
136 +rel_type: mergedusr
137 +profile: default/linux/mips/17.0/multilib/n32/systemd/merged-usr
138 +snapshot: @TIMESTAMP@
139 +source_subpath: mergedusr/stage1-mips3_multilib-systemd-mergedusr-@TIMESTAMP@
140 +compression_mode: pixz
141 +decompressor_search_order: xz bzip2
142 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
143 +portage_prefix: releng
144
145 diff --git a/releases/specs-qemu/mips/stage3-mips3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips3-n32-systemd-mu.spec
146 new file mode 100644
147 index 00000000..84ac22fd
148 --- /dev/null
149 +++ b/releases/specs-qemu/mips/stage3-mips3-n32-systemd-mu.spec
150 @@ -0,0 +1,12 @@
151 +subarch: mips3_n32
152 +target: stage3
153 +version_stamp: systemd-mergedusr-@TIMESTAMP@
154 +interpreter: /usr/bin/qemu-mipsn32
155 +rel_type: mergedusr
156 +profile: default/linux/mips/17.0/n32/systemd/merged-usr
157 +snapshot: @TIMESTAMP@
158 +source_subpath: mergedusr/stage1-mips3_n32-systemd-mergedusr-@TIMESTAMP@
159 +compression_mode: pixz
160 +decompressor_search_order: xz bzip2
161 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
162 +portage_prefix: releng
163
164 diff --git a/releases/specs-qemu/mips/stage3-mips3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips3-n64-systemd-mu.spec
165 new file mode 100644
166 index 00000000..deea4e58
167 --- /dev/null
168 +++ b/releases/specs-qemu/mips/stage3-mips3-n64-systemd-mu.spec
169 @@ -0,0 +1,12 @@
170 +subarch: mips3_n64
171 +target: stage3
172 +version_stamp: systemd-mergedusr-@TIMESTAMP@
173 +interpreter: /usr/bin/qemu-mips64
174 +rel_type: mergedusr
175 +profile: default/linux/mips/17.0/n64/systemd/merged-usr
176 +snapshot: @TIMESTAMP@
177 +source_subpath: mergedusr/stage1-mips3_n64-systemd-mergedusr-@TIMESTAMP@
178 +compression_mode: pixz
179 +decompressor_search_order: xz bzip2
180 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
181 +portage_prefix: releng
182
183 diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
184 index 6b255d6d..25735317 100644
185 --- a/tools/catalyst-auto-qemu-mips-common
186 +++ b/tools/catalyst-auto-qemu-mips-common
187 @@ -9,12 +9,16 @@ EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
188 SETS_BE="
189 mips2_o32_openrc
190 mips2_o32_systemd
191 + mips2_o32_systemd_mu
192 mips3_n32_openrc
193 mips3_n32_systemd
194 + mips3_n32_systemd_mu
195 mips3_n64_openrc
196 mips3_n64_systemd
197 + mips3_n64_systemd_mu
198 mips3_multilib_openrc
199 mips3_multilib_systemd
200 + mips3_multilib_systemd_mu
201 "
202
203 SETS_LE="
204 @@ -35,6 +39,7 @@ SETS_LE="
205
206 SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
207 SET_mips2_o32_systemd_SPECS="stage1-mips2-o32-systemd.spec stage3-mips2-o32-systemd.spec"
208 +SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o32-systemd-mu.spec"
209
210 SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
211 SET_mipsel2_o32_systemd_SPECS="stage1-mipsel2-o32-systemd.spec stage3-mipsel2-o32-systemd.spec"
212 @@ -44,18 +49,21 @@ SET_mipsel3_o32_systemd_SPECS="stage1-mipsel3-o32-systemd.spec stage3-mipsel3-o3
213
214 SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
215 SET_mips3_n32_systemd_SPECS="stage1-mips3-n32-systemd.spec stage3-mips3-n32-systemd.spec"
216 +SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n32-systemd-mu.spec"
217
218 SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
219 SET_mipsel3_n32_systemd_SPECS="stage1-mipsel3-n32-systemd.spec stage3-mipsel3-n32-systemd.spec"
220
221 SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
222 SET_mips3_multilib_systemd_SPECS="stage1-mips3-multilib-systemd.spec stage3-mips3-multilib-systemd.spec"
223 +SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage3-mips3-multilib-systemd-mu.spec"
224
225 SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
226 SET_mipsel3_multilib_systemd_SPECS="stage1-mipsel3-multilib-systemd.spec stage3-mipsel3-multilib-systemd.spec"
227
228 SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
229 SET_mips3_n64_systemd_SPECS="stage1-mips3-n64-systemd.spec stage3-mips3-n64-systemd.spec"
230 +SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec stage3-mips3-n64-systemd-mu.spec"
231
232 SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec"
233 SET_mipsel3_n64_systemd_SPECS="stage1-mipsel3-n64-systemd.spec stage3-mipsel3-n64-systemd.spec"
234 @@ -142,6 +150,18 @@ post_build() {
235
236 pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
237 case ${spec} in
238 + stage3-mips2-o32-systemd-mu.spec)
239 + upload stage3-mips2-systemd-mergedusr-${TIMESTAMP}.tar.xz*
240 + ;;
241 + stage3-mips3-n32-systemd-mu.spec)
242 + upload stage3-mips3_n32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
243 + ;;
244 + stage3-mips3-n64-systemd-mu.spec)
245 + upload stage3-mips3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
246 + ;;
247 + stage3-mips3-multilib-systemd-mu.spec)
248 + upload stage3-mips3_multilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
249 + ;;
250 stage3-mipsel3-n64-systemd-mu.spec)
251 upload stage3-mipsel3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
252 ;;