commit: b04e67a1cf9102ecedb98b0908c3f62dfcc2482f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 12:42:28 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 12:42:28 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b04e67a1
Add mips LE systemd merged-usr builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec | 14 ++++++++++++++
.../mips/stage1-mipsel3-multilib-systemd-mu.spec | 14 ++++++++++++++
.../specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec | 14 ++++++++++++++
.../specs-qemu/mips/stage1-mipsel3-o32-systemd-mu.spec | 14 ++++++++++++++
.../specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec | 12 ++++++++++++
.../mips/stage3-mipsel3-multilib-systemd-mu.spec | 12 ++++++++++++
.../specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec | 12 ++++++++++++
.../specs-qemu/mips/stage3-mipsel3-o32-systemd-mu.spec | 12 ++++++++++++
tools/catalyst-auto-qemu-mips-common | 18 ++++++++++++++++--
9 files changed, 120 insertions(+), 2 deletions(-)
diff --git a/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec
new file mode 100644
index 00000000..fb477612
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mipsel2-o32-systemd-mu.spec
@@ -0,0 +1,14 @@
+subarch: mipsel2
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsel
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage3-mipsel2-systemd-mergedusr-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec
b/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec
new file mode 100644
index 00000000..5054a7ed
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mipsel3-multilib-systemd-mu.spec
@@ -0,0 +1,14 @@
+subarch: mipsel3_multilib
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel
/usr/bin/qemu-mips64el
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage3-mipsel3_multilib-systemd-mergedusr-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec
b/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec
new file mode 100644
index 00000000..be36988d
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd-mu.spec
@@ -0,0 +1,14 @@
+subarch: mipsel3_n32
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32el
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/n32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage3-mipsel3_n32-systemd-mergedusr-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage1-mipsel3-o32-systemd-mu.spec
new file mode 100644
index 00000000..8f141de9
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mipsel3-o32-systemd-mu.spec
@@ -0,0 +1,14 @@
+subarch: mipsel3
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsel
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage3-mipsel3-systemd-mergedusr-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec
new file mode 100644
index 00000000..be91374d
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mipsel2-o32-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: mipsel2
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsel
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage1-mipsel2-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec
b/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec
new file mode 100644
index 00000000..1219129d
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mipsel3-multilib-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: mipsel3_multilib
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32el /usr/bin/qemu-mipsel
/usr/bin/qemu-mips64el
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage1-mipsel3_multilib-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec
b/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec
new file mode 100644
index 00000000..fe06193e
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: mipsel3_n32
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32el
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/n32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage1-mipsel3_n32-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage3-mipsel3-o32-systemd-mu.spec
new file mode 100644
index 00000000..6cbe81f1
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mipsel3-o32-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: mipsel3
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsel
+rel_type: mergedusr
+profile: default/linux/mips/17.0/mipsel/o32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage1-mipsel3-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index 25735317..6f7b0c79 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -24,15 +24,19 @@ SETS_BE="
SETS_LE="
mipsel2_o32_openrc
mipsel2_o32_systemd
+ mipsel2_o32_systemd_mu
mipsel3_o32_openrc
mipsel3_o32_systemd
+ mipsel3_o32_systemd_mu
mipsel3_n32_openrc
mipsel3_n32_systemd
+ mipsel3_n32_systemd_mu
mipsel3_n64_openrc
mipsel3_n64_systemd
mipsel3_n64_systemd_mu
mipsel3_multilib_openrc
mipsel3_multilib_systemd
+ mipsel3_multilib_systemd_mu
"
# SETS="${SETS_BE} ${SETS_LE}"
@@ -43,9 +47,11 @@
SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o3
SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec
stage3-mipsel2-o32-openrc.spec"
SET_mipsel2_o32_systemd_SPECS="stage1-mipsel2-o32-systemd.spec
stage3-mipsel2-o32-systemd.spec"
+SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec
stage3-mipsel2-o32-systemd-mu.spec"
SET_mipsel3_o32_openrc_SPECS="stage1-mipsel3-o32-openrc.spec
stage3-mipsel3-o32-openrc.spec"
SET_mipsel3_o32_systemd_SPECS="stage1-mipsel3-o32-systemd.spec
stage3-mipsel3-o32-systemd.spec"
+SET_mipsel3_o32_systemd_mu_SPECS="stage1-mipsel3-o32-systemd-mu.spec
stage3-mipsel3-o32-systemd-mu.spec"
SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec
stage3-mips3-n32-openrc.spec"
SET_mips3_n32_systemd_SPECS="stage1-mips3-n32-systemd.spec
stage3-mips3-n32-systemd.spec"
@@ -53,6 +59,7 @@
SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n3
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec
stage3-mipsel3-n32-openrc.spec"
SET_mipsel3_n32_systemd_SPECS="stage1-mipsel3-n32-systemd.spec
stage3-mipsel3-n32-systemd.spec"
+SET_mipsel3_n32_mu_systemd_SPECS="stage1-mipsel3-n32-systemd-mu.spec
stage3-mipsel3-n32-systemd-mu.spec"
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
SET_mips3_multilib_systemd_SPECS="stage1-mips3-multilib-systemd.spec
stage3-mips3-multilib-systemd.spec"
@@ -60,6 +67,7 @@
SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
SET_mipsel3_multilib_systemd_SPECS="stage1-mipsel3-multilib-systemd.spec
stage3-mipsel3-multilib-systemd.spec"
+SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec
stage3-mipsel3-multilib-systemd-mu.spec"
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec
stage3-mips3-n64-openrc.spec"
SET_mips3_n64_systemd_SPECS="stage1-mips3-n64-systemd.spec
stage3-mips3-n64-systemd.spec"
@@ -162,11 +170,17 @@ post_build() {
stage3-mips3-multilib-systemd-mu.spec)
upload
stage3-mips3_multilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
+ stage3-mipsel2-o32-systemd-mu.spec)
+ upload stage3-mipsel2-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-mipsel3-o32-systemd-mu.spec)
+ upload stage3-mipsel3-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mipsel3-n64-systemd-mu.spec)
upload stage3-mipsel3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
- stage3-mips64el-n64-systemd-mu.spec)
- upload
stage3-mips64el_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ stage3-mipsel3-multilib-systemd-mu.spec)
+ upload
stage3-mipsel3_multilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
