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: Thu, 17 Jun 2021 22:49:55
Message-Id: 1623970148.53d7a6a3abfbf94dbdb117d1e1e81f6959052d4d.dilfridge@gentoo
1 commit: 53d7a6a3abfbf94dbdb117d1e1e81f6959052d4d
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 17 22:49:08 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 17 22:49:08 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=53d7a6a3
7
8 riscv: Add 20.0 lp64 (softfloat) builds
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec | 15 +++++++++++++++
13 releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec | 15 +++++++++++++++
14 releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec | 13 +++++++++++++
15 releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec | 13 +++++++++++++
16 tools/catalyst-auto-qemu-riscv.conf | 6 +++++-
17 5 files changed, 61 insertions(+), 1 deletion(-)
18
19 diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec b/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec
20 new file mode 100644
21 index 00000000..1b894918
22 --- /dev/null
23 +++ b/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec
24 @@ -0,0 +1,15 @@
25 +subarch: rv64_lp64
26 +target: stage1
27 +version_stamp: 20.0-openrc-@TIMESTAMP@
28 +cflags: -O2 -pipe
29 +interpreter: /usr/bin/qemu-riscv64
30 +rel_type: 20.0
31 +profile: default/linux/riscv/20.0/rv64gc/lp64
32 +snapshot: @TIMESTAMP@
33 +source_subpath: 20.0/stage3-rv64_lp64-20.0-openrc-latest
34 +compression_mode: pixz
35 +decompressor_search_order: xz bzip2
36 +update_seed: yes
37 +update_seed_command: -uDN @world
38 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
39 +portage_prefix: releng
40
41 diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec
42 new file mode 100644
43 index 00000000..c0229f34
44 --- /dev/null
45 +++ b/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec
46 @@ -0,0 +1,15 @@
47 +subarch: rv64_lp64
48 +target: stage1
49 +version_stamp: 20.0-systemd-@TIMESTAMP@
50 +cflags: -O2 -pipe
51 +interpreter: /usr/bin/qemu-riscv64
52 +rel_type: 20.0
53 +profile: default/linux/riscv/20.0/rv64gc/lp64/systemd
54 +snapshot: @TIMESTAMP@
55 +source_subpath: 20.0/stage3-rv64_lp64-20.0-systemd-latest
56 +compression_mode: pixz
57 +decompressor_search_order: xz bzip2
58 +update_seed: yes
59 +update_seed_command: -uDN @world
60 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
61 +portage_prefix: releng
62
63 diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec
64 new file mode 100644
65 index 00000000..867c071a
66 --- /dev/null
67 +++ b/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec
68 @@ -0,0 +1,13 @@
69 +subarch: rv64_lp64
70 +target: stage3
71 +version_stamp: 20.0-openrc-@TIMESTAMP@
72 +cflags: -O2 -pipe
73 +interpreter: /usr/bin/qemu-riscv64
74 +rel_type: 20.0
75 +profile: default/linux/riscv/20.0/rv64gc/lp64
76 +snapshot: @TIMESTAMP@
77 +source_subpath: 20.0/stage1-rv64_lp64-20.0-openrc-@TIMESTAMP@
78 +compression_mode: pixz
79 +decompressor_search_order: xz bzip2
80 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
81 +portage_prefix: releng
82
83 diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec
84 new file mode 100644
85 index 00000000..a7fdb7a9
86 --- /dev/null
87 +++ b/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec
88 @@ -0,0 +1,13 @@
89 +subarch: rv64_lp64
90 +target: stage3
91 +version_stamp: 20.0-systemd-@TIMESTAMP@
92 +cflags: -O2 -pipe
93 +interpreter: /usr/bin/qemu-riscv64
94 +rel_type: 20.0
95 +profile: default/linux/riscv/20.0/rv64gc/lp64/systemd
96 +snapshot: @TIMESTAMP@
97 +source_subpath: 20.0/stage1-rv64_lp64-20.0-systemd-@TIMESTAMP@
98 +compression_mode: pixz
99 +decompressor_search_order: xz bzip2
100 +portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
101 +portage_prefix: releng
102
103 diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
104 index e55cd0e5..35279968 100644
105 --- a/tools/catalyst-auto-qemu-riscv.conf
106 +++ b/tools/catalyst-auto-qemu-riscv.conf
107 @@ -13,6 +13,8 @@ EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
108 SETS="
109 lp64d_200_openrc
110 lp64d_200_systemd
111 + lp64_200_openrc
112 + lp64_200_systemd
113 lp64d
114 lp64
115 lp64d_systemd
116 @@ -27,6 +29,8 @@ SET_multilib_SPECS="stage1-multilib.spec stage3-multilib.spec"
117
118 SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
119 SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
120 +SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec"
121 +SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-systemd.spec"
122
123 SET_lp64d_SPECS="stage1-lp64d.spec stage3-lp64d.spec"
124 SET_lp64_SPECS="stage1-lp64.spec stage3-lp64.spec"
125 @@ -38,7 +42,7 @@ SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"
126 update_symlinks() {
127 # Symlink the latest stages3 to build from
128 local d f
129 - for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
130 + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/20.0" ; do
131 pushd "${d}" >/dev/null
132 for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
133 local of=$(echo "${f}" | convert_filename)