commit: 0b6c63cb26de43ec8c88fc28cbc2739c74c1d003
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 19:16:39 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 19:16:39 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0b6c63cb
Add m68k musl build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/m68k/stage1-musl.spec | 13 +++++++++++++
releases/specs-qemu/m68k/stage3-musl.spec | 11 +++++++++++
tools/catalyst-auto-qemu-m68k.conf | 9 ++++++++-
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/releases/specs-qemu/m68k/stage1-musl.spec
b/releases/specs-qemu/m68k/stage1-musl.spec
new file mode 100644
index 00000000..90e5719b
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage1-musl.spec
@@ -0,0 +1,13 @@
+subarch: m68k_musl
+version_stamp: @TIMESTAMP@
+target: stage1
+rel_type: musl
+profile: default/linux/m68k/17.0/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage3-m68k_musl-latest
+compression_mode: pixz
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-m68k
diff --git a/releases/specs-qemu/m68k/stage3-musl.spec
b/releases/specs-qemu/m68k/stage3-musl.spec
new file mode 100644
index 00000000..ac15fc04
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage3-musl.spec
@@ -0,0 +1,11 @@
+subarch: m68k_musl
+version_stamp: @TIMESTAMP@
+target: stage3
+rel_type: musl
+profile: default/linux/m68k/17.0/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage1-m68k_musl-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-m68k
diff --git a/tools/catalyst-auto-qemu-m68k.conf
b/tools/catalyst-auto-qemu-m68k.conf
index 868a27f6..3a10d3c0 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/m68k
EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
+ musl
openrc
systemd
systemd_mu
@@ -19,11 +20,12 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; 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
@@ -53,6 +55,11 @@ post_build() {
upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz*
popd >/dev/null
;;
+ stage3-musl.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
+ upload stage3-m68k_musl-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
*)
echo "Finished ${spec}"
;;