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:42:52
Message-Id: 1669552948.b04e67a1cf9102ecedb98b0908c3f62dfcc2482f.dilfridge@gentoo
1 commit: b04e67a1cf9102ecedb98b0908c3f62dfcc2482f
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 27 12:42:28 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 12:42:28 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b04e67a1
7
8 Add mips LE systemd merged-usr builds
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 .../specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec | 14 ++++++++++++++
13 .../mips/stage1-mipsel3-multilib-systemd-mu.spec | 14 ++++++++++++++
14 .../specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec | 14 ++++++++++++++
15 .../specs-qemu/mips/stage1-mipsel3-o32-systemd-mu.spec | 14 ++++++++++++++
16 .../specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec | 12 ++++++++++++
17 .../mips/stage3-mipsel3-multilib-systemd-mu.spec | 12 ++++++++++++
18 .../specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec | 12 ++++++++++++
19 .../specs-qemu/mips/stage3-mipsel3-o32-systemd-mu.spec | 12 ++++++++++++
20 tools/catalyst-auto-qemu-mips-common | 18 ++++++++++++++++--
21 9 files changed, 120 insertions(+), 2 deletions(-)
22
23 diff --git a/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec
24 new file mode 100644
25 index 00000000..fb477612
26 --- /dev/null
27 +++ b/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec
28 @@ -0,0 +1,14 @@
29 +subarch: mipsel2
30 +target: stage1
31 +version_stamp: systemd-mergedusr-@TIMESTAMP@
32 +interpreter: /usr/bin/qemu-mipsel
33 +rel_type: mergedusr
34 +profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
35 +snapshot: @TIMESTAMP@
36 +source_subpath: mergedusr/stage3-mipsel2-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-mipsel3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec
45 new file mode 100644
46 index 00000000..5054a7ed
47 --- /dev/null
48 +++ b/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec
49 @@ -0,0 +1,14 @@
50 +subarch: mipsel3_multilib
51 +target: stage1
52 +version_stamp: systemd-mergedusr-@TIMESTAMP@
53 +interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel /usr/bin/qemu-mips64el
54 +rel_type: mergedusr
55 +profile: default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr
56 +snapshot: @TIMESTAMP@
57 +source_subpath: mergedusr/stage3-mipsel3_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-mipsel3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec
66 new file mode 100644
67 index 00000000..be36988d
68 --- /dev/null
69 +++ b/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec
70 @@ -0,0 +1,14 @@
71 +subarch: mipsel3_n32
72 +target: stage1
73 +version_stamp: systemd-mergedusr-@TIMESTAMP@
74 +interpreter: /usr/bin/qemu-mipsn32el
75 +rel_type: mergedusr
76 +profile: default/linux/mips/17.0/mipsel/n32/systemd/merged-usr
77 +snapshot: @TIMESTAMP@
78 +source_subpath: mergedusr/stage3-mipsel3_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-mipsel3-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel3-o32-systemd-mu.spec
87 new file mode 100644
88 index 00000000..8f141de9
89 --- /dev/null
90 +++ b/releases/specs-qemu/mips/stage1-mipsel3-o32-systemd-mu.spec
91 @@ -0,0 +1,14 @@
92 +subarch: mipsel3
93 +target: stage1
94 +version_stamp: systemd-mergedusr-@TIMESTAMP@
95 +interpreter: /usr/bin/qemu-mipsel
96 +rel_type: mergedusr
97 +profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
98 +snapshot: @TIMESTAMP@
99 +source_subpath: mergedusr/stage3-mipsel3-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-mipsel2-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec
108 new file mode 100644
109 index 00000000..be91374d
110 --- /dev/null
111 +++ b/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec
112 @@ -0,0 +1,12 @@
113 +subarch: mipsel2
114 +target: stage3
115 +version_stamp: systemd-mergedusr-@TIMESTAMP@
116 +interpreter: /usr/bin/qemu-mipsel
117 +rel_type: mergedusr
118 +profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
119 +snapshot: @TIMESTAMP@
120 +source_subpath: mergedusr/stage1-mipsel2-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-mipsel3-multilib-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec
127 new file mode 100644
128 index 00000000..1219129d
129 --- /dev/null
130 +++ b/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec
131 @@ -0,0 +1,12 @@
132 +subarch: mipsel3_multilib
133 +target: stage3
134 +version_stamp: systemd-mergedusr-@TIMESTAMP@
135 +interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel /usr/bin/qemu-mips64el
136 +rel_type: mergedusr
137 +profile: default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr
138 +snapshot: @TIMESTAMP@
139 +source_subpath: mergedusr/stage1-mipsel3_multilib-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-mipsel3-n32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec
146 new file mode 100644
147 index 00000000..fe06193e
148 --- /dev/null
149 +++ b/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec
150 @@ -0,0 +1,12 @@
151 +subarch: mipsel3_n32
152 +target: stage3
153 +version_stamp: systemd-mergedusr-@TIMESTAMP@
154 +interpreter: /usr/bin/qemu-mipsn32el
155 +rel_type: mergedusr
156 +profile: default/linux/mips/17.0/mipsel/n32/systemd/merged-usr
157 +snapshot: @TIMESTAMP@
158 +source_subpath: mergedusr/stage1-mipsel3_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-mipsel3-o32-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel3-o32-systemd-mu.spec
165 new file mode 100644
166 index 00000000..6cbe81f1
167 --- /dev/null
168 +++ b/releases/specs-qemu/mips/stage3-mipsel3-o32-systemd-mu.spec
169 @@ -0,0 +1,12 @@
170 +subarch: mipsel3
171 +target: stage3
172 +version_stamp: systemd-mergedusr-@TIMESTAMP@
173 +interpreter: /usr/bin/qemu-mipsel
174 +rel_type: mergedusr
175 +profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
176 +snapshot: @TIMESTAMP@
177 +source_subpath: mergedusr/stage1-mipsel3-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 25735317..6f7b0c79 100644
185 --- a/tools/catalyst-auto-qemu-mips-common
186 +++ b/tools/catalyst-auto-qemu-mips-common
187 @@ -24,15 +24,19 @@ SETS_BE="
188 SETS_LE="
189 mipsel2_o32_openrc
190 mipsel2_o32_systemd
191 + mipsel2_o32_systemd_mu
192 mipsel3_o32_openrc
193 mipsel3_o32_systemd
194 + mipsel3_o32_systemd_mu
195 mipsel3_n32_openrc
196 mipsel3_n32_systemd
197 + mipsel3_n32_systemd_mu
198 mipsel3_n64_openrc
199 mipsel3_n64_systemd
200 mipsel3_n64_systemd_mu
201 mipsel3_multilib_openrc
202 mipsel3_multilib_systemd
203 + mipsel3_multilib_systemd_mu
204 "
205
206 # SETS="${SETS_BE} ${SETS_LE}"
207 @@ -43,9 +47,11 @@ SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o3
208
209 SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
210 SET_mipsel2_o32_systemd_SPECS="stage1-mipsel2-o32-systemd.spec stage3-mipsel2-o32-systemd.spec"
211 +SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec stage3-mipsel2-o32-systemd-mu.spec"
212
213 SET_mipsel3_o32_openrc_SPECS="stage1-mipsel3-o32-openrc.spec stage3-mipsel3-o32-openrc.spec"
214 SET_mipsel3_o32_systemd_SPECS="stage1-mipsel3-o32-systemd.spec stage3-mipsel3-o32-systemd.spec"
215 +SET_mipsel3_o32_systemd_mu_SPECS="stage1-mipsel3-o32-systemd-mu.spec stage3-mipsel3-o32-systemd-mu.spec"
216
217 SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
218 SET_mips3_n32_systemd_SPECS="stage1-mips3-n32-systemd.spec stage3-mips3-n32-systemd.spec"
219 @@ -53,6 +59,7 @@ SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n3
220
221 SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
222 SET_mipsel3_n32_systemd_SPECS="stage1-mipsel3-n32-systemd.spec stage3-mipsel3-n32-systemd.spec"
223 +SET_mipsel3_n32_mu_systemd_SPECS="stage1-mipsel3-n32-systemd-mu.spec stage3-mipsel3-n32-systemd-mu.spec"
224
225 SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
226 SET_mips3_multilib_systemd_SPECS="stage1-mips3-multilib-systemd.spec stage3-mips3-multilib-systemd.spec"
227 @@ -60,6 +67,7 @@ SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage
228
229 SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
230 SET_mipsel3_multilib_systemd_SPECS="stage1-mipsel3-multilib-systemd.spec stage3-mipsel3-multilib-systemd.spec"
231 +SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec stage3-mipsel3-multilib-systemd-mu.spec"
232
233 SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
234 SET_mips3_n64_systemd_SPECS="stage1-mips3-n64-systemd.spec stage3-mips3-n64-systemd.spec"
235 @@ -162,11 +170,17 @@ post_build() {
236 stage3-mips3-multilib-systemd-mu.spec)
237 upload stage3-mips3_multilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
238 ;;
239 + stage3-mipsel2-o32-systemd-mu.spec)
240 + upload stage3-mipsel2-systemd-mergedusr-${TIMESTAMP}.tar.xz*
241 + ;;
242 + stage3-mipsel3-o32-systemd-mu.spec)
243 + upload stage3-mipsel3-systemd-mergedusr-${TIMESTAMP}.tar.xz*
244 + ;;
245 stage3-mipsel3-n64-systemd-mu.spec)
246 upload stage3-mipsel3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
247 ;;
248 - stage3-mips64el-n64-systemd-mu.spec)
249 - upload stage3-mips64el_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
250 + stage3-mipsel3-multilib-systemd-mu.spec)
251 + upload stage3-mipsel3_multilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
252 ;;
253 esac
254 popd >/dev/null