| 1 |
commit: 337f8feec71460810390365d0836f79295708259 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 27 15:09:22 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 27 15:09:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=337f8fee |
| 7 |
|
| 8 |
Build riscv64 lp64d musl |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
releases/specs-qemu/riscv/stage1-lp64d-musl.spec | 14 ++++++++++++++ |
| 13 |
releases/specs-qemu/riscv/stage3-lp64d-musl.spec | 12 ++++++++++++ |
| 14 |
tools/catalyst-auto-qemu-riscv.conf | 16 ++++++++++++++-- |
| 15 |
3 files changed, 40 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-musl.spec b/releases/specs-qemu/riscv/stage1-lp64d-musl.spec |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..b902f5e4 |
| 20 |
--- /dev/null |
| 21 |
+++ b/releases/specs-qemu/riscv/stage1-lp64d-musl.spec |
| 22 |
@@ -0,0 +1,14 @@ |
| 23 |
+subarch: rv64_lp64d |
| 24 |
+target: stage1 |
| 25 |
+version_stamp: musl-@TIMESTAMP@ |
| 26 |
+interpreter: /usr/bin/qemu-riscv64 |
| 27 |
+rel_type: musl |
| 28 |
+profile: default/linux/riscv/20.0/rv64gc/lp64d/musl |
| 29 |
+snapshot: @TIMESTAMP@ |
| 30 |
+source_subpath: musl/stage3-rv64_lp64d-musl-latest |
| 31 |
+compression_mode: pixz |
| 32 |
+decompressor_search_order: xz bzip2 |
| 33 |
+update_seed: yes |
| 34 |
+update_seed_command: -uDN @world |
| 35 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
| 36 |
+portage_prefix: releng |
| 37 |
|
| 38 |
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-musl.spec b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec |
| 39 |
new file mode 100644 |
| 40 |
index 00000000..b66506b6 |
| 41 |
--- /dev/null |
| 42 |
+++ b/releases/specs-qemu/riscv/stage3-lp64d-musl.spec |
| 43 |
@@ -0,0 +1,12 @@ |
| 44 |
+subarch: rv64_lp64d |
| 45 |
+target: stage3 |
| 46 |
+version_stamp: musl-@TIMESTAMP@ |
| 47 |
+interpreter: /usr/bin/qemu-riscv64 |
| 48 |
+rel_type: musl |
| 49 |
+profile: default/linux/riscv/20.0/rv64gc/lp64d/musl |
| 50 |
+snapshot: @TIMESTAMP@ |
| 51 |
+source_subpath: musl/stage1-rv64_lp64d-musl-@TIMESTAMP@ |
| 52 |
+compression_mode: pixz |
| 53 |
+decompressor_search_order: xz bzip2 |
| 54 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu |
| 55 |
+portage_prefix: releng |
| 56 |
|
| 57 |
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf |
| 58 |
index 9d634695..6af25e4b 100644 |
| 59 |
--- a/tools/catalyst-auto-qemu-riscv.conf |
| 60 |
+++ b/tools/catalyst-auto-qemu-riscv.conf |
| 61 |
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv |
| 62 |
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]" |
| 63 |
|
| 64 |
SETS=" |
| 65 |
+ lp64d_musl |
| 66 |
lp64d_openrc |
| 67 |
lp64d_systemd |
| 68 |
lp64_openrc |
| 69 |
@@ -19,6 +20,7 @@ SETS=" |
| 70 |
multilib_systemd |
| 71 |
" |
| 72 |
|
| 73 |
+SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec" |
| 74 |
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec" |
| 75 |
SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec" |
| 76 |
SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec" |
| 77 |
@@ -29,7 +31,7 @@ SET_multilib_systemd_SPECS="stage1-multilib-systemd.spec stage3-multilib-systemd |
| 78 |
update_symlinks() { |
| 79 |
# Symlink the latest stages3 to build from |
| 80 |
local d f |
| 81 |
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do |
| 82 |
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do |
| 83 |
pushd "${d}" >/dev/null |
| 84 |
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do |
| 85 |
local of=$(echo "${f}" | convert_filename) |
| 86 |
@@ -43,11 +45,21 @@ post_build() { |
| 87 |
local set=$1 spec=$2 |
| 88 |
|
| 89 |
case ${spec} in |
| 90 |
- stage3*.spec) |
| 91 |
+ stage3*openrc.spec) |
| 92 |
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null |
| 93 |
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz* |
| 94 |
popd >/dev/null |
| 95 |
;; |
| 96 |
+ stage3*systemd.spec) |
| 97 |
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null |
| 98 |
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz* |
| 99 |
+ popd >/dev/null |
| 100 |
+ ;; |
| 101 |
+ stage3*musl.spec) |
| 102 |
+ pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null |
| 103 |
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz* |
| 104 |
+ popd >/dev/null |
| 105 |
+ ;; |
| 106 |
*) |
| 107 |
echo "Finished ${spec}" |
| 108 |
;; |
Archives