From a137292167e79a115d46d038a4fcdd6a43639765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 19 Nov 2022 14:50:07 +0100 Subject: [PATCH] Add riscv systemd merged-usr build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- .../specs-qemu/riscv/stage1-lp64-systemd-mu.spec | 15 +++++++++++++++ .../specs-qemu/riscv/stage1-lp64d-systemd-mu.spec | 15 +++++++++++++++ .../riscv/stage1-multilib-systemd-mu.spec | 15 +++++++++++++++ .../specs-qemu/riscv/stage3-lp64-systemd-mu.spec | 13 +++++++++++++ .../specs-qemu/riscv/stage3-lp64d-systemd-mu.spec | 13 +++++++++++++ .../riscv/stage3-multilib-systemd-mu.spec | 13 +++++++++++++ tools/catalyst-auto-qemu-riscv.conf | 10 +++++++++- 7 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 releases/specs-qemu/riscv/stage1-lp64-systemd-mu.spec create mode 100644 releases/specs-qemu/riscv/stage1-lp64d-systemd-mu.spec create mode 100644 releases/specs-qemu/riscv/stage1-multilib-systemd-mu.spec create mode 100644 releases/specs-qemu/riscv/stage3-lp64-systemd-mu.spec create mode 100644 releases/specs-qemu/riscv/stage3-lp64d-systemd-mu.spec create mode 100644 releases/specs-qemu/riscv/stage3-multilib-systemd-mu.spec 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)