1 |
commit: 07ac734d2509908d29a6b015432f0f3a9fe0cc5a |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 5 17:52:37 2022 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 5 17:52:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=07ac734d |
7 |
|
8 |
Split mips builds into two jobs (LE and BE) |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
...mu-mips.conf => catalyst-auto-qemu-mips-common} | 5 +- |
13 |
tools/catalyst-auto-qemu-mips.conf | 125 +-------------------- |
14 |
tools/catalyst-auto-qemu-mipsel.conf | 5 + |
15 |
3 files changed, 12 insertions(+), 123 deletions(-) |
16 |
|
17 |
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips-common |
18 |
similarity index 91% |
19 |
copy from tools/catalyst-auto-qemu-mips.conf |
20 |
copy to tools/catalyst-auto-qemu-mips-common |
21 |
index f47c5a6f..fe24d575 100644 |
22 |
--- a/tools/catalyst-auto-qemu-mips.conf |
23 |
+++ b/tools/catalyst-auto-qemu-mips-common |
24 |
@@ -6,7 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa |
25 |
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips |
26 |
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]" |
27 |
|
28 |
-SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mipsel3o32openrc mips3n32openrc mipsel3n32openrc mips3multilibopenrc mipsel3multilibopenrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64multilibopenrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd" |
29 |
+SETS_BE="mips2o32openrc mips32o32openrc mips3n32openrc mips3multilibopenrc mips3n64openrc mips64n32openrc mips64multilibopenrc mips64n64openrc" |
30 |
+SETS_LE="mipsel2o32openrc mips32elo32openrc mipsel3o32openrc mipsel3n32openrc mipsel3multilibopenrc mipsel3n64openrc mipsel3n64systemd mips64eln32openrc mips64elmultilibopenrc mips64eln64openrc mips64eln64systemd" |
31 |
+ |
32 |
+# SETS="${SETS_BE} ${SETS_LE}" |
33 |
|
34 |
SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec" |
35 |
SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec" |
36 |
|
37 |
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf |
38 |
index f47c5a6f..5e594770 100644 |
39 |
--- a/tools/catalyst-auto-qemu-mips.conf |
40 |
+++ b/tools/catalyst-auto-qemu-mips.conf |
41 |
@@ -1,124 +1,5 @@ |
42 |
-# This is the config file for the catalyst-auto script. It should be pretty |
43 |
-# self-explanatory. |
44 |
- |
45 |
-UPLOAD_USER=mips |
46 |
-UPLOAD_KEY=/root/.ssh/id_rsa |
47 |
-SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips |
48 |
-EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]" |
49 |
+# only BE |
50 |
|
51 |
-SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mipsel3o32openrc mips3n32openrc mipsel3n32openrc mips3multilibopenrc mipsel3multilibopenrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64multilibopenrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd" |
52 |
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common |
53 |
|
54 |
-SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec" |
55 |
-SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec" |
56 |
- |
57 |
-SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc.spec stage3-mips32-o32-openrc.spec" |
58 |
-SET_mips32elo32openrc_SPECS="stage1-mips32el-o32-openrc.spec stage3-mips32el-o32-openrc.spec" |
59 |
- |
60 |
-SET_mipsel3o32openrc_SPECS="stage1-mipsel3-o32-openrc.spec stage3-mipsel3-o32-openrc.spec" |
61 |
- |
62 |
-SET_mips3n32openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec" |
63 |
-SET_mipsel3n32openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec" |
64 |
- |
65 |
-SET_mips3multilibopenrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec" |
66 |
-SET_mipsel3multilibopenrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec" |
67 |
- |
68 |
-SET_mips3n64openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec" |
69 |
-SET_mipsel3n64openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec" |
70 |
-SET_mipsel3n64systemd_SPECS="stage1-mipsel3-n64-systemd.spec stage3-mipsel3-n64-systemd.spec" |
71 |
- |
72 |
-SET_mips64n32openrc_SPECS="stage1-mips64-n32-openrc.spec stage3-mips64-n32-openrc.spec" |
73 |
-SET_mips64eln32openrc_SPECS="stage1-mips64el-n32-openrc.spec stage3-mips64el-n32-openrc.spec" |
74 |
- |
75 |
-SET_mips64multilibopenrc_SPECS="stage1-mips64-multilib-openrc.spec stage3-mips64-multilib-openrc.spec" |
76 |
-SET_mips64elmultilibopenrc_SPECS="stage1-mips64el-multilib-openrc.spec stage3-mips64el-multilib-openrc.spec" |
77 |
- |
78 |
-SET_mips64n64openrc_SPECS="stage1-mips64-n64-openrc.spec stage3-mips64-n64-openrc.spec" |
79 |
-SET_mips64eln64openrc_SPECS="stage1-mips64el-n64-openrc.spec stage3-mips64el-n64-openrc.spec" |
80 |
-SET_mips64eln64systemd_SPECS="stage1-mips64el-n64-systemd.spec stage3-mips64el-n64-systemd.spec" |
81 |
- |
82 |
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips |
83 |
- |
84 |
- |
85 |
-update_symlinks() { |
86 |
- # Symlink the latest stages3 to build from |
87 |
- local d f |
88 |
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do |
89 |
- pushd "${d}" >/dev/null |
90 |
- for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do |
91 |
- local of=$(echo "${f}" | convert_filename) |
92 |
- ln -sf "${f}" "${of}" |
93 |
- done |
94 |
- popd >/dev/null |
95 |
- done |
96 |
-} |
97 |
- |
98 |
-post_build() { |
99 |
- local set=$1 spec=$2 |
100 |
- |
101 |
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null |
102 |
- |
103 |
- case ${spec} in |
104 |
- stage3-mips2-o32-openrc.spec) |
105 |
- upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz* |
106 |
- ;; |
107 |
- stage3-mipsel2-o32-openrc.spec) |
108 |
- upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz* |
109 |
- ;; |
110 |
- stage3-mips32-o32-openrc.spec) |
111 |
- upload stage3-mips32-openrc-${TIMESTAMP}.tar.xz* |
112 |
- ;; |
113 |
- stage3-mips32el-o32-openrc.spec) |
114 |
- upload stage3-mips32el-openrc-${TIMESTAMP}.tar.xz* |
115 |
- ;; |
116 |
- stage3-mipsel3-o32-openrc.spec) |
117 |
- upload stage3-mipsel3-openrc-${TIMESTAMP}.tar.xz* |
118 |
- ;; |
119 |
- stage3-mips3-n32-openrc.spec) |
120 |
- upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz* |
121 |
- ;; |
122 |
- stage3-mips3-multilib-openrc.spec) |
123 |
- upload stage3-mips3_multilib-openrc-${TIMESTAMP}.tar.xz* |
124 |
- ;; |
125 |
- stage3-mipsel3-n32-openrc.spec) |
126 |
- upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz* |
127 |
- ;; |
128 |
- stage3-mipsel3-multilib-openrc.spec) |
129 |
- upload stage3-mipsel3_multilib-openrc-${TIMESTAMP}.tar.xz* |
130 |
- ;; |
131 |
- stage3-mips3-n64-openrc.spec) |
132 |
- upload stage3-mips3_n64-openrc-${TIMESTAMP}.tar.xz* |
133 |
- ;; |
134 |
- stage3-mipsel3-n64-openrc.spec) |
135 |
- upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz* |
136 |
- ;; |
137 |
- stage3-mipsel3-n64-systemd.spec) |
138 |
- upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz* |
139 |
- ;; |
140 |
- stage3-mips64-n32-openrc.spec) |
141 |
- upload stage3-mips64_n32-openrc-${TIMESTAMP}.tar.xz* |
142 |
- ;; |
143 |
- stage3-mips64-multilib-openrc.spec) |
144 |
- upload stage3-mips64_multilib-openrc-${TIMESTAMP}.tar.xz* |
145 |
- ;; |
146 |
- stage3-mips64el-n32-openrc.spec) |
147 |
- upload stage3-mips64el_n32-openrc-${TIMESTAMP}.tar.xz* |
148 |
- ;; |
149 |
- stage3-mips64el-multilib-openrc.spec) |
150 |
- upload stage3-mips64el_multilib-openrc-${TIMESTAMP}.tar.xz* |
151 |
- ;; |
152 |
- stage3-mips64-n64-openrc.spec) |
153 |
- upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz* |
154 |
- ;; |
155 |
- stage3-mips64el-n64-openrc.spec) |
156 |
- upload stage3-mips64el_n64-openrc-${TIMESTAMP}.tar.xz* |
157 |
- ;; |
158 |
- stage3-mips64el-n64-systemd.spec) |
159 |
- upload stage3-mips64el_n64-systemd-${TIMESTAMP}.tar.xz* |
160 |
- ;; |
161 |
- *) |
162 |
- echo "Finished ${spec}" |
163 |
- ;; |
164 |
- esac |
165 |
- |
166 |
- popd >/dev/null |
167 |
-} |
168 |
+SETS=${SETS_BE} |
169 |
|
170 |
diff --git a/tools/catalyst-auto-qemu-mipsel.conf b/tools/catalyst-auto-qemu-mipsel.conf |
171 |
new file mode 100644 |
172 |
index 00000000..9434e91e |
173 |
--- /dev/null |
174 |
+++ b/tools/catalyst-auto-qemu-mipsel.conf |
175 |
@@ -0,0 +1,5 @@ |
176 |
+# only LE |
177 |
+ |
178 |
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common |
179 |
+ |
180 |
+SETS=${SETS_LE} |