* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/
@ 2021-06-16 21:29 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2021-06-16 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 79129d9161c0bdf4ee617ce4a9f5299d7f646765
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 16 21:28:27 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 21:28:27 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=79129d91
riscv: skip stage2 everywhere, go stage1 -> stage3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/riscv/stage2-ilp32.spec | 13 -------------
releases/specs-qemu/riscv/stage2-lp64-systemd.spec | 13 -------------
releases/specs-qemu/riscv/stage2-lp64.spec | 13 -------------
releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec | 13 -------------
releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec | 13 -------------
releases/specs-qemu/riscv/stage2-lp64d-systemd.spec | 13 -------------
releases/specs-qemu/riscv/stage2-lp64d.spec | 13 -------------
releases/specs-qemu/riscv/stage2-multilib.spec | 13 -------------
releases/specs-qemu/riscv/stage3-ilp32.spec | 2 +-
releases/specs-qemu/riscv/stage3-lp64-systemd.spec | 2 +-
releases/specs-qemu/riscv/stage3-lp64.spec | 2 +-
releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec | 2 +-
releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec | 2 +-
releases/specs-qemu/riscv/stage3-lp64d-systemd.spec | 2 +-
releases/specs-qemu/riscv/stage3-lp64d.spec | 2 +-
releases/specs-qemu/riscv/stage3-multilib.spec | 2 +-
tools/catalyst-auto-qemu-riscv.conf | 16 ++++++++--------
17 files changed, 16 insertions(+), 120 deletions(-)
diff --git a/releases/specs-qemu/riscv/stage2-ilp32.spec b/releases/specs-qemu/riscv/stage2-ilp32.spec
deleted file mode 100644
index c1ffdbf7..00000000
--- a/releases/specs-qemu/riscv/stage2-ilp32.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv32_ilp32
-target: stage2
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/17.0/rv32imac/ilp32
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv32_ilp32-@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/riscv/stage2-lp64-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64-systemd.spec
deleted file mode 100644
index 7b44190a..00000000
--- a/releases/specs-qemu/riscv/stage2-lp64-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64
-target: stage2
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-systemd-@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/riscv/stage2-lp64.spec b/releases/specs-qemu/riscv/stage2-lp64.spec
deleted file mode 100644
index 0754a68a..00000000
--- a/releases/specs-qemu/riscv/stage2-lp64.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64
-target: stage2
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-@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/riscv/stage2-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec
deleted file mode 100644
index 241ace4d..00000000
--- a/releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage2
-version_stamp: 20.0-openrc-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: 20.0
-profile: default/linux/riscv/20.0/rv64gc/lp64d
-snapshot: @TIMESTAMP@
-source_subpath: 20.0/stage1-rv64_lp64d-20.0-openrc-@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/riscv/stage2-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec
deleted file mode 100644
index 4685179c..00000000
--- a/releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage2
-version_stamp: 20.0-systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: 20.0
-profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd
-snapshot: @TIMESTAMP@
-source_subpath: 20.0/stage1-rv64_lp64d-20.0-systemd-@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/riscv/stage2-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec
deleted file mode 100644
index 06d89a6b..00000000
--- a/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage2
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-systemd-@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/riscv/stage2-lp64d.spec b/releases/specs-qemu/riscv/stage2-lp64d.spec
deleted file mode 100644
index 6a231f87..00000000
--- a/releases/specs-qemu/riscv/stage2-lp64d.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage2
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-@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/riscv/stage2-multilib.spec b/releases/specs-qemu/riscv/stage2-multilib.spec
deleted file mode 100644
index 05ce3407..00000000
--- a/releases/specs-qemu/riscv/stage2-multilib.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_multilib
-target: stage2
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe -g
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_multilib-@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/riscv/stage3-ilp32.spec b/releases/specs-qemu/riscv/stage3-ilp32.spec
index b477807e..36921587 100644
--- a/releases/specs-qemu/riscv/stage3-ilp32.spec
+++ b/releases/specs-qemu/riscv/stage3-ilp32.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv32
rel_type: default
profile: default/linux/riscv/17.0/rv32imac/ilp32
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-rv32_ilp32-@TIMESTAMP@
+source_subpath: default/stage1-rv32_ilp32-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
index 5f916ecb..873acc29 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64
rel_type: default
profile: default/linux/riscv/17.0/rv64gc/lp64/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-rv64_lp64-systemd-@TIMESTAMP@
+source_subpath: default/stage1-rv64_lp64-systemd-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64.spec b/releases/specs-qemu/riscv/stage3-lp64.spec
index 79315ba0..708c8b58 100644
--- a/releases/specs-qemu/riscv/stage3-lp64.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64
rel_type: default
profile: default/linux/riscv/17.0/rv64gc/lp64
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-rv64_lp64-@TIMESTAMP@
+source_subpath: default/stage1-rv64_lp64-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec
index f4f1c8a0..56850d34 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64
rel_type: 20.0
profile: default/linux/riscv/20.0/rv64gc/lp64d
snapshot: @TIMESTAMP@
-source_subpath: 20.0/stage2-rv64_lp64d-20.0-openrc-@TIMESTAMP@
+source_subpath: 20.0/stage1-rv64_lp64d-20.0-openrc-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec
index 77d57710..278ceb87 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64
rel_type: 20.0
profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd
snapshot: @TIMESTAMP@
-source_subpath: 20.0/stage2-rv64_lp64d-20.0-systemd-@TIMESTAMP@
+source_subpath: 20.0/stage1-rv64_lp64d-20.0-systemd-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
index 21e8096e..075c5b15 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64
rel_type: default
profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-rv64_lp64d-systemd-@TIMESTAMP@
+source_subpath: default/stage1-rv64_lp64d-systemd-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64d.spec b/releases/specs-qemu/riscv/stage3-lp64d.spec
index 55b252fd..22861abc 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64
rel_type: default
profile: default/linux/riscv/17.0/rv64gc/lp64d
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-rv64_lp64d-@TIMESTAMP@
+source_subpath: default/stage1-rv64_lp64d-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-multilib.spec b/releases/specs-qemu/riscv/stage3-multilib.spec
index 289bc34a..b6458820 100644
--- a/releases/specs-qemu/riscv/stage3-multilib.spec
+++ b/releases/specs-qemu/riscv/stage3-multilib.spec
@@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
rel_type: default
profile: default/linux/riscv/17.0/rv64gc
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-rv64_multilib-@TIMESTAMP@
+source_subpath: default/stage1-rv64_multilib-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index a1ebcf8e..e55cd0e5 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -23,17 +23,17 @@ SETS="
# ilp32
# multilib needs re-bootstrapping
-SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec"
+SET_multilib_SPECS="stage1-multilib.spec stage3-multilib.spec"
-SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage2-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
-SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage2-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
+SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
+SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
-SET_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec"
-SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec"
-SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage2-lp64d-systemd.spec stage3-lp64d-systemd.spec"
-SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage2-lp64-systemd.spec stage3-lp64-systemd.spec"
+SET_lp64d_SPECS="stage1-lp64d.spec stage3-lp64d.spec"
+SET_lp64_SPECS="stage1-lp64.spec stage3-lp64.spec"
+SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
+SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
-SET_ilp32_SPECS="stage1-ilp32.spec stage2-ilp32.spec stage3-ilp32.spec"
+SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/
@ 2021-06-19 13:04 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2021-06-19 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 7df0e0824b9268f10fac352289e7dd7af6fd816f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 13:03:33 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 13:03:33 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7df0e082
riscv: stop 17.0 stage builds now that 20.0 works
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/riscv/stage1-lp64-systemd.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-lp64.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-lp64d-systemd.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-lp64d.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-multilib.spec | 15 ---------------
releases/specs-qemu/riscv/stage3-lp64-systemd.spec | 13 -------------
releases/specs-qemu/riscv/stage3-lp64.spec | 13 -------------
releases/specs-qemu/riscv/stage3-lp64d-systemd.spec | 13 -------------
releases/specs-qemu/riscv/stage3-lp64d.spec | 13 -------------
releases/specs-qemu/riscv/stage3-multilib.spec | 13 -------------
tools/catalyst-auto-qemu-riscv.conf | 9 ---------
11 files changed, 149 deletions(-)
diff --git a/releases/specs-qemu/riscv/stage1-lp64-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
deleted file mode 100644
index 38aa42a7..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64-systemd-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/riscv/stage1-lp64.spec b/releases/specs-qemu/riscv/stage1-lp64.spec
deleted file mode 100644
index 699fbc22..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64
-target: stage1
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64-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/riscv/stage1-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
deleted file mode 100644
index 17df7d5b..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64d
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64d-systemd-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/riscv/stage1-lp64d.spec b/releases/specs-qemu/riscv/stage1-lp64d.spec
deleted file mode 100644
index bebc911c..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64d.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64d
-target: stage1
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64d-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/riscv/stage1-multilib.spec b/releases/specs-qemu/riscv/stage1-multilib.spec
deleted file mode 100644
index ae25631d..00000000
--- a/releases/specs-qemu/riscv/stage1-multilib.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_multilib
-target: stage1
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe -g
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_multilib-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/riscv/stage3-lp64-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
deleted file mode 100644
index 873acc29..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-systemd-@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/riscv/stage3-lp64.spec b/releases/specs-qemu/riscv/stage3-lp64.spec
deleted file mode 100644
index 708c8b58..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64
-target: stage3
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-@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/riscv/stage3-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
deleted file mode 100644
index 075c5b15..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-systemd-@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/riscv/stage3-lp64d.spec b/releases/specs-qemu/riscv/stage3-lp64d.spec
deleted file mode 100644
index 22861abc..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64d.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage3
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-@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/riscv/stage3-multilib.spec b/releases/specs-qemu/riscv/stage3-multilib.spec
deleted file mode 100644
index b6458820..00000000
--- a/releases/specs-qemu/riscv/stage3-multilib.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_multilib
-target: stage3
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe -g
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_multilib-@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-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 35279968..146a43f0 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -15,10 +15,6 @@ SETS="
lp64d_200_systemd
lp64_200_openrc
lp64_200_systemd
- lp64d
- lp64
- lp64d_systemd
- lp64_systemd
"
# riscv32 does not work yet
@@ -32,11 +28,6 @@ SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-sy
SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec"
SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-systemd.spec"
-SET_lp64d_SPECS="stage1-lp64d.spec stage3-lp64d.spec"
-SET_lp64_SPECS="stage1-lp64.spec stage3-lp64.spec"
-SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
-SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
-
SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"
update_symlinks() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/
@ 2022-02-27 15:09 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2022-02-27 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 337f8feec71460810390365d0836f79295708259
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 15:09:22 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 15:09:22 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=337f8fee
Build riscv64 lp64d musl
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/riscv/stage1-lp64d-musl.spec | 14 ++++++++++++++
releases/specs-qemu/riscv/stage3-lp64d-musl.spec | 12 ++++++++++++
tools/catalyst-auto-qemu-riscv.conf | 16 ++++++++++++++--
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-musl.spec b/releases/specs-qemu/riscv/stage1-lp64d-musl.spec
new file mode 100644
index 00000000..b902f5e4
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage1-lp64d-musl.spec
@@ -0,0 +1,14 @@
+subarch: rv64_lp64d
+target: stage1
+version_stamp: musl-@TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv64
+rel_type: musl
+profile: default/linux/riscv/20.0/rv64gc/lp64d/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage3-rv64_lp64d-musl-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/riscv/stage3-lp64d-musl.spec b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
new file mode 100644
index 00000000..b66506b6
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
@@ -0,0 +1,12 @@
+subarch: rv64_lp64d
+target: stage3
+version_stamp: musl-@TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv64
+rel_type: musl
+profile: default/linux/riscv/20.0/rv64gc/lp64d/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage1-rv64_lp64d-musl-@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-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 9d634695..6af25e4b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
+ lp64d_musl
lp64d_openrc
lp64d_systemd
lp64_openrc
@@ -19,6 +20,7 @@ SETS="
multilib_systemd
"
+SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
@@ -29,7 +31,7 @@ SET_multilib_systemd_SPECS="stage1-multilib-systemd.spec stage3-multilib-systemd
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
@@ -43,11 +45,21 @@ post_build() {
local set=$1 spec=$2
case ${spec} in
- stage3*.spec)
+ stage3*openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
popd >/dev/null
;;
+ stage3*systemd.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
+ stage3*musl.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/
@ 2022-11-19 13:50 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2022-11-19 13:50 UTC (permalink / raw
To: gentoo-commits
commit: a137292167e79a115d46d038a4fcdd6a43639765
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 13:50:07 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 13:50:07 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a1372921
Add riscv systemd merged-usr build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec | 15 +++++++++++++++
releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec | 15 +++++++++++++++
releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec | 15 +++++++++++++++
releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec | 13 +++++++++++++
releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec | 13 +++++++++++++
releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec | 13 +++++++++++++
tools/catalyst-auto-qemu-riscv.conf | 10 +++++++++-
7 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
new file mode 100644
index 00000000..18643b3e
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
@@ -0,0 +1,15 @@
+subarch: rv64_lp64
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: default
+profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-rv64_lp64-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/riscv/stage1-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
new file mode 100644
index 00000000..e67bf0a5
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
@@ -0,0 +1,15 @@
+subarch: rv64_lp64d
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: default
+profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-rv64_lp64d-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/riscv/stage1-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
new file mode 100644
index 00000000..98d262ce
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
@@ -0,0 +1,15 @@
+subarch: rv64_multilib
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
+rel_type: default
+profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-rv64_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/riscv/stage3-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
new file mode 100644
index 00000000..f171832f
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: rv64_lp64
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: default
+profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-rv64_lp64-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/riscv/stage3-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
new file mode 100644
index 00000000..5be7e53b
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: rv64_lp64d
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: default
+profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-rv64_lp64d-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/riscv/stage3-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
new file mode 100644
index 00000000..4b784d51
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: rv64_multilib
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
+rel_type: default
+profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-rv64_multilib-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-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 036e2710..8b4edfdb 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -14,21 +14,29 @@ SETS="
lp64d_musl
lp64d_openrc
lp64d_systemd
+ lp64d_systemd_mu
lp64_musl
lp64_openrc
lp64_systemd
+ lp64_systemd_mu
multilib_openrc
multilib_systemd
+ multilib_systemd_mu
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
+SET_lp64d_systemd_mu_SPECS="stage1-lp64d-systemd-mu.spec stage3-lp64d-systemd-mu.spec"
+
SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
+SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec stage3-lp64-systemd-mu.spec"
+
SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec"
SET_multilib_systemd_SPECS="stage1-multilib-systemd.spec stage3-multilib-systemd.spec"
+SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-systemd-mu.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
@@ -54,7 +62,7 @@ post_build() {
;;
stage3*systemd.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
popd >/dev/null
;;
stage3*musl.spec)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/
@ 2022-11-24 13:44 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2022-11-24 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 1810d7e21b000da75ea9dc4f1d8d7a7549e24cd3
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 13:43:48 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 13:43:48 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1810d7e2
Move riscv merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec | 4 ++--
releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec | 4 ++--
releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec | 4 ++--
releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec | 4 ++--
releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec | 4 ++--
releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec | 4 ++--
tools/catalyst-auto-qemu-riscv.conf | 7 ++++++-
7 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
index 18643b3e..89ed0a02 100644
--- a/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@
cflags: -O2 -pipe
interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-rv64_lp64-systemd-mergedusr-latest
compression_mode: pixz
decompressor_search_order: xz bzip2
update_seed: no
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
index e67bf0a5..6d3a325f 100644
--- a/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@
cflags: -O2 -pipe
interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64d-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-rv64_lp64d-systemd-mergedusr-latest
compression_mode: pixz
decompressor_search_order: xz bzip2
update_seed: no
diff --git a/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
index 98d262ce..ee937b35 100644
--- a/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@
cflags: -O2 -pipe
interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
+rel_type: mergedusr
profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_multilib-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-rv64_multilib-systemd-mergedusr-latest
compression_mode: pixz
decompressor_search_order: xz bzip2
update_seed: no
diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
index f171832f..2e10e0fd 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage3
version_stamp: systemd-mergedusr-@TIMESTAMP@
cflags: -O2 -pipe
interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-rv64_lp64-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
index 5be7e53b..f1c823cb 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage3
version_stamp: systemd-mergedusr-@TIMESTAMP@
cflags: -O2 -pipe
interpreter: /usr/bin/qemu-riscv64
-rel_type: default
+rel_type: mergedusr
profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-rv64_lp64d-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
index 4b784d51..82412203 100644
--- a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
@@ -3,10 +3,10 @@ target: stage3
version_stamp: systemd-mergedusr-@TIMESTAMP@
cflags: -O2 -pipe
interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
+rel_type: mergedusr
profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_multilib-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-rv64_multilib-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 9c492491..04a1a89e 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -41,7 +41,7 @@ SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-s
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -66,6 +66,11 @@ post_build() {
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
popd >/dev/null
;;
+ stage3*systemd-mu.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
stage3*musl.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/
@ 2023-08-18 18:01 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2023-08-18 18:01 UTC (permalink / raw
To: gentoo-commits
commit: 757609f0031b5d66c2793a65b6dde5a5ac0fb449
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 18:01:02 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 18:01:02 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=757609f0
Add binrepo_path for all riscv stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/riscv/stage3-lp64-musl.spec | 1 +
releases/specs-qemu/riscv/stage3-lp64-openrc.spec | 1 +
releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec | 1 +
releases/specs-qemu/riscv/stage3-lp64-systemd.spec | 1 +
releases/specs-qemu/riscv/stage3-lp64d-musl.spec | 1 +
releases/specs-qemu/riscv/stage3-lp64d-openrc.spec | 1 +
releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec | 1 +
releases/specs-qemu/riscv/stage3-lp64d-systemd.spec | 1 +
releases/specs-qemu/riscv/stage3-multilib-openrc.spec | 1 +
releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec | 1 +
releases/specs-qemu/riscv/stage3-multilib-systemd.spec | 1 +
tools/catalyst-auto-qemu-riscv.conf | 1 +
12 files changed, 12 insertions(+)
diff --git a/releases/specs-qemu/riscv/stage3-lp64-musl.spec b/releases/specs-qemu/riscv/stage3-lp64-musl.spec
index 818e3a16..3adcb5a6 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-musl.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64-musl.spec
@@ -10,3 +10,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64_musl
diff --git a/releases/specs-qemu/riscv/stage3-lp64-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64-openrc.spec
index ec3a5fe1..91a27bd8 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-openrc.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64-openrc.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64
diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
index 2e10e0fd..099b7484 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64
diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
index 61b82f14..453a106c 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-musl.spec b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
index ffe0c1de..a23d6ef3 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec
@@ -10,3 +10,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64d_musl
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
index 94b7221f..0e189473 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64d
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
index f1c823cb..3d3895ef 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64d
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
index a2b34da2..49b21d09 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_lp64d
diff --git a/releases/specs-qemu/riscv/stage3-multilib-openrc.spec b/releases/specs-qemu/riscv/stage3-multilib-openrc.spec
index fe0d868b..e8b8d989 100644
--- a/releases/specs-qemu/riscv/stage3-multilib-openrc.spec
+++ b/releases/specs-qemu/riscv/stage3-multilib-openrc.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_multilib
diff --git a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
index 82412203..b62e4731 100644
--- a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
+++ b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_multilib
diff --git a/releases/specs-qemu/riscv/stage3-multilib-systemd.spec b/releases/specs-qemu/riscv/stage3-multilib-systemd.spec
index b5d14f62..df5e0ddb 100644
--- a/releases/specs-qemu/riscv/stage3-multilib-systemd.spec
+++ b/releases/specs-qemu/riscv/stage3-multilib-systemd.spec
@@ -11,3 +11,4 @@ compression_mode: pixz
decompressor_search_order: xz bzip2
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
+binrepo_path: riscv/binpackages/20.0/rv64_multilib
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 0f3c3562..da306f59 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -63,6 +63,7 @@ post_build() {
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_multilib" riscv/20.0/rv64_multilib
popd >/dev/null
;;
stage3*systemd-mu.spec)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-18 18:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-24 13:44 [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/riscv/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2023-08-18 18:01 Andreas K. Hüttel
2022-11-19 13:50 Andreas K. Hüttel
2022-02-27 15:09 Andreas K. Hüttel
2021-06-19 13:04 Andreas K. Hüttel
2021-06-16 21:29 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox