| 1 |
commit: 1810d7e21b000da75ea9dc4f1d8d7a7549e24cd3 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 24 13:43:48 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 24 13:43:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1810d7e2 |
| 7 |
|
| 8 |
Move riscv merged-usr builds to separate build types |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec | 4 ++-- |
| 13 |
releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec | 4 ++-- |
| 14 |
releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec | 4 ++-- |
| 15 |
releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec | 4 ++-- |
| 16 |
releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec | 4 ++-- |
| 17 |
releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec | 4 ++-- |
| 18 |
tools/catalyst-auto-qemu-riscv.conf | 7 ++++++- |
| 19 |
7 files changed, 18 insertions(+), 13 deletions(-) |
| 20 |
|
| 21 |
diff --git a/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec |
| 22 |
index 18643b3e..89ed0a02 100644 |
| 23 |
--- a/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec |
| 24 |
+++ b/releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec |
| 25 |
@@ -3,10 +3,10 @@ target: stage1 |
| 26 |
version_stamp: systemd-mergedusr-@TIMESTAMP@ |
| 27 |
cflags: -O2 -pipe |
| 28 |
interpreter: /usr/bin/qemu-riscv64 |
| 29 |
-rel_type: default |
| 30 |
+rel_type: mergedusr |
| 31 |
profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr |
| 32 |
snapshot: @TIMESTAMP@ |
| 33 |
-source_subpath: default/stage3-rv64_lp64-systemd-mergedusr-latest |
| 34 |
+source_subpath: mergedusr/stage3-rv64_lp64-systemd-mergedusr-latest |
| 35 |
compression_mode: pixz |
| 36 |
decompressor_search_order: xz bzip2 |
| 37 |
update_seed: no |
| 38 |
|
| 39 |
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec |
| 40 |
index e67bf0a5..6d3a325f 100644 |
| 41 |
--- a/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec |
| 42 |
+++ b/releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec |
| 43 |
@@ -3,10 +3,10 @@ target: stage1 |
| 44 |
version_stamp: systemd-mergedusr-@TIMESTAMP@ |
| 45 |
cflags: -O2 -pipe |
| 46 |
interpreter: /usr/bin/qemu-riscv64 |
| 47 |
-rel_type: default |
| 48 |
+rel_type: mergedusr |
| 49 |
profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr |
| 50 |
snapshot: @TIMESTAMP@ |
| 51 |
-source_subpath: default/stage3-rv64_lp64d-systemd-mergedusr-latest |
| 52 |
+source_subpath: mergedusr/stage3-rv64_lp64d-systemd-mergedusr-latest |
| 53 |
compression_mode: pixz |
| 54 |
decompressor_search_order: xz bzip2 |
| 55 |
update_seed: no |
| 56 |
|
| 57 |
diff --git a/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec |
| 58 |
index 98d262ce..ee937b35 100644 |
| 59 |
--- a/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec |
| 60 |
+++ b/releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec |
| 61 |
@@ -3,10 +3,10 @@ target: stage1 |
| 62 |
version_stamp: systemd-mergedusr-@TIMESTAMP@ |
| 63 |
cflags: -O2 -pipe |
| 64 |
interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32 |
| 65 |
-rel_type: default |
| 66 |
+rel_type: mergedusr |
| 67 |
profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr |
| 68 |
snapshot: @TIMESTAMP@ |
| 69 |
-source_subpath: default/stage3-rv64_multilib-systemd-mergedusr-latest |
| 70 |
+source_subpath: mergedusr/stage3-rv64_multilib-systemd-mergedusr-latest |
| 71 |
compression_mode: pixz |
| 72 |
decompressor_search_order: xz bzip2 |
| 73 |
update_seed: no |
| 74 |
|
| 75 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec |
| 76 |
index f171832f..2e10e0fd 100644 |
| 77 |
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec |
| 78 |
+++ b/releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec |
| 79 |
@@ -3,10 +3,10 @@ target: stage3 |
| 80 |
version_stamp: systemd-mergedusr-@TIMESTAMP@ |
| 81 |
cflags: -O2 -pipe |
| 82 |
interpreter: /usr/bin/qemu-riscv64 |
| 83 |
-rel_type: default |
| 84 |
+rel_type: mergedusr |
| 85 |
profile: default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr |
| 86 |
snapshot: @TIMESTAMP@ |
| 87 |
-source_subpath: default/stage1-rv64_lp64-systemd-mergedusr-@TIMESTAMP@ |
| 88 |
+source_subpath: mergedusr/stage1-rv64_lp64-systemd-mergedusr-@TIMESTAMP@ |
| 89 |
compression_mode: pixz |
| 90 |
decompressor_search_order: xz bzip2 |
| 91 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
| 92 |
|
| 93 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec |
| 94 |
index 5be7e53b..f1c823cb 100644 |
| 95 |
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec |
| 96 |
+++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec |
| 97 |
@@ -3,10 +3,10 @@ target: stage3 |
| 98 |
version_stamp: systemd-mergedusr-@TIMESTAMP@ |
| 99 |
cflags: -O2 -pipe |
| 100 |
interpreter: /usr/bin/qemu-riscv64 |
| 101 |
-rel_type: default |
| 102 |
+rel_type: mergedusr |
| 103 |
profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr |
| 104 |
snapshot: @TIMESTAMP@ |
| 105 |
-source_subpath: default/stage1-rv64_lp64d-systemd-mergedusr-@TIMESTAMP@ |
| 106 |
+source_subpath: mergedusr/stage1-rv64_lp64d-systemd-mergedusr-@TIMESTAMP@ |
| 107 |
compression_mode: pixz |
| 108 |
decompressor_search_order: xz bzip2 |
| 109 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
| 110 |
|
| 111 |
diff --git a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec |
| 112 |
index 4b784d51..82412203 100644 |
| 113 |
--- a/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec |
| 114 |
+++ b/releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec |
| 115 |
@@ -3,10 +3,10 @@ target: stage3 |
| 116 |
version_stamp: systemd-mergedusr-@TIMESTAMP@ |
| 117 |
cflags: -O2 -pipe |
| 118 |
interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32 |
| 119 |
-rel_type: default |
| 120 |
+rel_type: mergedusr |
| 121 |
profile: default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr |
| 122 |
snapshot: @TIMESTAMP@ |
| 123 |
-source_subpath: default/stage1-rv64_multilib-systemd-mergedusr-@TIMESTAMP@ |
| 124 |
+source_subpath: mergedusr/stage1-rv64_multilib-systemd-mergedusr-@TIMESTAMP@ |
| 125 |
compression_mode: pixz |
| 126 |
decompressor_search_order: xz bzip2 |
| 127 |
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
| 128 |
|
| 129 |
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf |
| 130 |
index 9c492491..04a1a89e 100644 |
| 131 |
--- a/tools/catalyst-auto-qemu-riscv.conf |
| 132 |
+++ b/tools/catalyst-auto-qemu-riscv.conf |
| 133 |
@@ -41,7 +41,7 @@ SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-s |
| 134 |
update_symlinks() { |
| 135 |
# Symlink the latest stages3 to build from |
| 136 |
local d f |
| 137 |
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do |
| 138 |
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; do |
| 139 |
mkdir -p "${d}" |
| 140 |
pushd "${d}" >/dev/null |
| 141 |
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do |
| 142 |
@@ -66,6 +66,11 @@ post_build() { |
| 143 |
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz* |
| 144 |
popd >/dev/null |
| 145 |
;; |
| 146 |
+ stage3*systemd-mu.spec) |
| 147 |
+ pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null |
| 148 |
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz* |
| 149 |
+ popd >/dev/null |
| 150 |
+ ;; |
| 151 |
stage3*musl.spec) |
| 152 |
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null |
| 153 |
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz* |
Archives