1 |
commit: cf6f590d35c8173e28b67b623a5c5239b9b7bdc8 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 9 20:00:57 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 9 20:00:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cf6f590d |
7 |
|
8 |
amd64: move hardened multilib builds to demeter |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
releases/specs/amd64/hardened/admincd-stage1.spec | 2 +- |
13 |
.../hardened/{stage1.spec => stage1-openrc.spec} | 4 ++-- |
14 |
.../hardened/{stage2.spec => stage2-openrc.spec} | 4 ++-- |
15 |
.../hardened/{stage3.spec => stage3-openrc.spec} | 4 ++-- |
16 |
tools/catalyst-auto-amd64-demeter.conf | 22 +++++++++++++++++++++- |
17 |
tools/catalyst-auto-amd64.conf | 10 ---------- |
18 |
6 files changed, 28 insertions(+), 18 deletions(-) |
19 |
|
20 |
diff --git a/releases/specs/amd64/hardened/admincd-stage1.spec b/releases/specs/amd64/hardened/admincd-stage1.spec |
21 |
index 4a178574..4a8d72e8 100644 |
22 |
--- a/releases/specs/amd64/hardened/admincd-stage1.spec |
23 |
+++ b/releases/specs/amd64/hardened/admincd-stage1.spec |
24 |
@@ -4,7 +4,7 @@ target: livecd-stage1 |
25 |
rel_type: hardened |
26 |
profile: default/linux/amd64/17.1/hardened |
27 |
snapshot: @TIMESTAMP@ |
28 |
-source_subpath: hardened/stage3-amd64-hardened-@TIMESTAMP@ |
29 |
+source_subpath: hardened/stage3-amd64-hardened-openrc-@TIMESTAMP@ |
30 |
compression_mode: pixz_x |
31 |
portage_confdir: @REPO_DIR@/releases/portage/isos |
32 |
|
33 |
|
34 |
diff --git a/releases/specs/amd64/hardened/stage1.spec b/releases/specs/amd64/hardened/stage1-openrc.spec |
35 |
similarity index 73% |
36 |
rename from releases/specs/amd64/hardened/stage1.spec |
37 |
rename to releases/specs/amd64/hardened/stage1-openrc.spec |
38 |
index dc124488..796503b4 100644 |
39 |
--- a/releases/specs/amd64/hardened/stage1.spec |
40 |
+++ b/releases/specs/amd64/hardened/stage1-openrc.spec |
41 |
@@ -1,10 +1,10 @@ |
42 |
subarch: amd64 |
43 |
target: stage1 |
44 |
-version_stamp: hardened-@TIMESTAMP@ |
45 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
46 |
rel_type: hardened |
47 |
profile: default/linux/amd64/17.1/hardened |
48 |
snapshot: @TIMESTAMP@ |
49 |
-source_subpath: hardened/stage3-amd64-hardened-latest |
50 |
+source_subpath: hardened/stage3-amd64-hardened-openrc-latest |
51 |
compression_mode: pixz_x |
52 |
update_seed: yes |
53 |
update_seed_command: --update --deep --newuse @world |
54 |
|
55 |
diff --git a/releases/specs/amd64/hardened/stage2.spec b/releases/specs/amd64/hardened/stage2-openrc.spec |
56 |
similarity index 66% |
57 |
rename from releases/specs/amd64/hardened/stage2.spec |
58 |
rename to releases/specs/amd64/hardened/stage2-openrc.spec |
59 |
index 4b9b5639..0b80aa9d 100644 |
60 |
--- a/releases/specs/amd64/hardened/stage2.spec |
61 |
+++ b/releases/specs/amd64/hardened/stage2-openrc.spec |
62 |
@@ -1,10 +1,10 @@ |
63 |
subarch: amd64 |
64 |
target: stage2 |
65 |
-version_stamp: hardened-@TIMESTAMP@ |
66 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
67 |
rel_type: hardened |
68 |
profile: default/linux/amd64/17.1/hardened |
69 |
snapshot: @TIMESTAMP@ |
70 |
-source_subpath: hardened/stage1-amd64-hardened-@TIMESTAMP@ |
71 |
+source_subpath: hardened/stage1-amd64-hardened-openrc-@TIMESTAMP@ |
72 |
compression_mode: pixz_x |
73 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
74 |
portage_prefix: releng |
75 |
|
76 |
diff --git a/releases/specs/amd64/hardened/stage3.spec b/releases/specs/amd64/hardened/stage3-openrc.spec |
77 |
similarity index 66% |
78 |
rename from releases/specs/amd64/hardened/stage3.spec |
79 |
rename to releases/specs/amd64/hardened/stage3-openrc.spec |
80 |
index 937b86e6..e686080d 100644 |
81 |
--- a/releases/specs/amd64/hardened/stage3.spec |
82 |
+++ b/releases/specs/amd64/hardened/stage3-openrc.spec |
83 |
@@ -1,10 +1,10 @@ |
84 |
subarch: amd64 |
85 |
target: stage3 |
86 |
-version_stamp: hardened-@TIMESTAMP@ |
87 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
88 |
rel_type: hardened |
89 |
profile: default/linux/amd64/17.1/hardened |
90 |
snapshot: @TIMESTAMP@ |
91 |
-source_subpath: hardened/stage2-amd64-hardened-@TIMESTAMP@ |
92 |
+source_subpath: hardened/stage2-amd64-hardened-openrc-@TIMESTAMP@ |
93 |
compression_mode: pixz_x |
94 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
95 |
portage_prefix: releng |
96 |
|
97 |
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf |
98 |
index f540af26..bfe2509c 100644 |
99 |
--- a/tools/catalyst-auto-amd64-demeter.conf |
100 |
+++ b/tools/catalyst-auto-amd64-demeter.conf |
101 |
@@ -8,17 +8,26 @@ host=$(hostname) |
102 |
ARCH="amd64" |
103 |
TYPE="auto" |
104 |
|
105 |
+EMAIL_SUBJECT_PREPEND="[amd64-auto]" |
106 |
+ |
107 |
SPECS_DIR=${REPO_DIR}/releases/specs/amd64 |
108 |
|
109 |
SETS=" |
110 |
+ hardened_openrc |
111 |
nomultilib_openrc |
112 |
+ nomultilib_systemd |
113 |
musl |
114 |
musl_hardened |
115 |
x32_openrc |
116 |
" |
117 |
|
118 |
+SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec" |
119 |
+SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
120 |
+ |
121 |
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-openrc.spec nomultilib/stage3-openrc.spec" |
122 |
+SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage2-systemd.spec nomultilib/stage3-systemd.spec" |
123 |
|
124 |
+##SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" |
125 |
##SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec" |
126 |
|
127 |
SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec" |
128 |
@@ -32,7 +41,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" |
129 |
|
130 |
update_symlinks() { |
131 |
# Symlink the latest stages3 to build from |
132 |
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,musl,musl-hardened} ; do |
133 |
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl,musl-hardened} ; do |
134 |
pushd "${d}" >/dev/null || exit |
135 |
shopt -s extglob |
136 |
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
137 |
@@ -68,6 +77,17 @@ post_build() { |
138 |
esac |
139 |
popd >/dev/null || exit |
140 |
|
141 |
+ pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit |
142 |
+ case ${spec} in |
143 |
+ hardened/stage3-openrc.spec) |
144 |
+ upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz* |
145 |
+ ;; |
146 |
+ hardened/admincd-stage2.spec) |
147 |
+ upload admincd-amd64-${TIMESTAMP}.iso* |
148 |
+ ;; |
149 |
+ esac |
150 |
+ popd >/dev/null || exit |
151 |
+ |
152 |
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit |
153 |
case ${spec} in |
154 |
musl/stage3.spec) |
155 |
|
156 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
157 |
index b18efeba..ebfb4d4f 100644 |
158 |
--- a/tools/catalyst-auto-amd64.conf |
159 |
+++ b/tools/catalyst-auto-amd64.conf |
160 |
@@ -14,7 +14,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64 |
161 |
SETS=" |
162 |
multilib minimal_multilib |
163 |
systemd |
164 |
- hardened_multilib minimal_hardened_multilib |
165 |
hardened_nomultilib minimal_hardened_nomultilib |
166 |
hardened_multilib_selinux hardened_nomultilib_selinux |
167 |
" |
168 |
@@ -25,9 +24,6 @@ SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec |
169 |
|
170 |
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" |
171 |
|
172 |
-SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
173 |
-SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
174 |
-#SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" |
175 |
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
176 |
#SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec" |
177 |
|
178 |
@@ -85,12 +81,6 @@ post_build() { |
179 |
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit |
180 |
UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened |
181 |
case ${spec} in |
182 |
- hardened/stage3.spec) |
183 |
- upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz* |
184 |
- ;; |
185 |
- hardened/admincd-stage2.spec) |
186 |
- upload admincd-amd64-${TIMESTAMP}.iso* |
187 |
- ;; |
188 |
hardened/stage4-minimal.spec) |
189 |
upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* |
190 |
;; |