commit: bb1d1fcf83925c68b2884f68694335ece5dbe77f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 13:47:05 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 13:47:05 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bb1d1fcf
Add mips2_softfloat-o32-systemd-mu
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../mips/stage1-mips2_softfloat-o32-systemd-mu.spec | 14 ++++++++++++++
.../mips/stage1-mipsel2_softfloat-o32-systemd-mu.spec | 14 ++++++++++++++
.../mips/stage3-mips2_softfloat-o32-systemd-mu.spec | 12 ++++++++++++
.../mips/stage3-mipsel2_softfloat-o32-systemd-mu.spec | 12 ++++++++++++
tools/catalyst-auto-qemu-mips-common | 14 ++++++++++++--
5 files changed, 64 insertions(+), 2 deletions(-)
diff --git
a/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-systemd-mu.spec
new file mode 100644
index 00000000..9b913320
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mips2_softfloat-o32-systemd-mu.spec
@@ -0,0 +1,14 @@
+subarch: mips2_softfloat
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mips
+rel_type: mergedusr
+profile: default/linux/mips/17.0/o32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage3-mips2_softfloat-systemd-mergedusr-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git
a/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-systemd-mu.spec
new file mode 100644
index 00000000..3dc77a65
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mipsel2_softfloat-o32-systemd-mu.spec
@@ -0,0 +1,14 @@
+subarch: mipsel2_softfloat
+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_softfloat-systemd-mergedusr-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git
a/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-systemd-mu.spec
new file mode 100644
index 00000000..87ed507e
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mips2_softfloat-o32-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: mips2_softfloat
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mips
+rel_type: mergedusr
+profile: default/linux/mips/17.0/o32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage1-mips2_softfloat-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-mipsel2_softfloat-o32-systemd-mu.spec
b/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-systemd-mu.spec
new file mode 100644
index 00000000..c38655b2
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mipsel2_softfloat-o32-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: mipsel2_softfloat
+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_softfloat-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 ac398b49..76c9dbc1 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -12,12 +12,14 @@ SETS_O32="
mips2_o32_systemd_mu
mips2_softfloat_o32_openrc
mips2_softfloat_o32_systemd
+ mips2_softfloat_o32_systemd_mu
mips2_o32_musl
mipsel2_o32_openrc
mipsel2_o32_systemd
mipsel2_o32_systemd_mu
mipsel2_softfloat_o32_openrc
mipsel2_softfloat_o32_systemd
+ mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_musl
mipsel3_o32_openrc
mipsel3_o32_systemd
@@ -58,6 +60,7 @@
SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o3
SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec
stage3-mips2_softfloat-o32-openrc.spec"
SET_mips2_softfloat_o32_systemd_SPECS="stage1-mips2_softfloat-o32-systemd.spec
stage3-mips2_softfloat-o32-systemd.spec"
+SET_mips2_softfloat_o32_systemd_mu_SPECS="stage1-mips2_softfloat-o32-systemd-mu.spec
stage3-mips2_softfloat-o32-systemd-mu.spec"
SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec
stage3-mips2-o32-musl.spec"
@@ -67,6 +70,7 @@
SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec stage3-mips
SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec
stage3-mipsel2_softfloat-o32-openrc.spec"
SET_mipsel2_softfloat_o32_systemd_SPECS="stage1-mipsel2_softfloat-o32-systemd.spec
stage3-mipsel2_softfloat-o32-systemd.spec"
+SET_mipsel2_softfloat_o32_systemd_mu_SPECS="stage1-mipsel2_softfloat-o32-systemd-mu.spec
stage3-mipsel2_softfloat-o32-systemd-mu.spec"
SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec
stage3-mipsel2-o32-musl.spec"
@@ -194,6 +198,9 @@ post_build() {
stage3-mips2-o32-systemd-mu.spec)
upload stage3-mips2-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
+ stage3-mips2_softfloat-o32-systemd-mu.spec)
+ upload
stage3-mips2_softfloat-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mips3-n32-systemd-mu.spec)
upload stage3-mips3_n32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
@@ -206,6 +213,9 @@ post_build() {
stage3-mipsel2-o32-systemd-mu.spec)
upload stage3-mipsel2-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
+ stage3-mipsel2_softfloat-o32-systemd-mu.spec)
+ upload
stage3-mipsel2_softfloat-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mipsel3-o32-systemd-mu.spec)
upload stage3-mipsel3-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
@@ -224,10 +234,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
case ${spec} in
stage3-mips2-o32-musl.spec)
- upload stage3-mips2-musl-${TIMESTAMP}.tar.xz*
+ upload stage3-mips2_musl-${TIMESTAMP}.tar.xz*
;;
stage3-mipsel2-o32-musl.spec)
- upload stage3-mipsel2-musl-${TIMESTAMP}.tar.xz*
+ upload stage3-mipsel2_musl-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null