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}"
;;
