Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/specs-qemu/riscv/, tools/
Date: Fri, 25 Jun 2021 19:17:22
Message-Id: 1624648619.b4823a0904e496ec8e94490b2677638fe7dc70a6.dilfridge@gentoo
1 commit: b4823a0904e496ec8e94490b2677638fe7dc70a6
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 25 19:16:59 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 25 19:16:59 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b4823a09
7
8 riscv: add multilib/systemd stages
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 .../specs-qemu/riscv/stage1-multilib-20.0-systemd.spec | 15 +++++++++++++++
13 .../specs-qemu/riscv/stage3-multilib-20.0-systemd.spec | 13 +++++++++++++
14 tools/catalyst-auto-qemu-riscv.conf | 2 ++
15 3 files changed, 30 insertions(+)
16
17 diff --git a/releases/specs-qemu/riscv/stage1-multilib-20.0-systemd.spec b/releases/specs-qemu/riscv/stage1-multilib-20.0-systemd.spec
18 new file mode 100644
19 index 00000000..ff07b073
20 --- /dev/null
21 +++ b/releases/specs-qemu/riscv/stage1-multilib-20.0-systemd.spec
22 @@ -0,0 +1,15 @@
23 +subarch: rv64_multilib
24 +target: stage1
25 +version_stamp: 20.0-systemd-@TIMESTAMP@
26 +cflags: -O2 -pipe
27 +interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
28 +rel_type: 20.0
29 +profile: default/linux/riscv/20.0/rv64gc/multilib/systemd
30 +snapshot: @TIMESTAMP@
31 +source_subpath: 20.0/stage3-rv64_multilib-20.0-systemd-latest
32 +compression_mode: pixz
33 +decompressor_search_order: xz bzip2
34 +update_seed: yes
35 +update_seed_command: -uDN @world
36 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
37 +portage_prefix: releng
38
39 diff --git a/releases/specs-qemu/riscv/stage3-multilib-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-multilib-20.0-systemd.spec
40 new file mode 100644
41 index 00000000..124efd93
42 --- /dev/null
43 +++ b/releases/specs-qemu/riscv/stage3-multilib-20.0-systemd.spec
44 @@ -0,0 +1,13 @@
45 +subarch: rv64_multilib
46 +target: stage3
47 +version_stamp: 20.0-systemd-@TIMESTAMP@
48 +cflags: -O2 -pipe
49 +interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
50 +rel_type: 20.0
51 +profile: default/linux/riscv/20.0/rv64gc/multilib/systemd
52 +snapshot: @TIMESTAMP@
53 +source_subpath: 20.0/stage1-rv64_multilib-20.0-systemd-@TIMESTAMP@
54 +compression_mode: pixz
55 +decompressor_search_order: xz bzip2
56 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
57 +portage_prefix: releng
58
59 diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
60 index 78b7197d..4954bdae 100644
61 --- a/tools/catalyst-auto-qemu-riscv.conf
62 +++ b/tools/catalyst-auto-qemu-riscv.conf
63 @@ -16,6 +16,7 @@ SETS="
64 lp64_200_openrc
65 lp64_200_systemd
66 multilib_200_openrc
67 + multilib_200_systemd
68 "
69
70 # riscv32 does not work yet
71 @@ -26,6 +27,7 @@ SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-sy
72 SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec"
73 SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-systemd.spec"
74 SET_multilib_200_openrc_SPECS="stage1-multilib-20.0-openrc.spec stage3-multilib-20.0-openrc.spec"
75 +SET_multilib_200_systemd_SPECS="stage1-multilib-20.0-systemd.spec stage3-multilib-20.0-systemd.spec"
76
77 SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"