1 |
commit: 13ab05785a432bf6f14873e64f293ed87c95c077 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 31 01:24:26 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 31 19:41:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=13ab0578 |
7 |
|
8 |
tools-hardened: Remove |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
tools-hardened/clean.sh | 6 -- |
13 |
tools-hardened/common.sh | 61 -------------- |
14 |
tools-hardened/run-armv7a.sh | 96 ---------------------- |
15 |
.../stage1-armv7a_hardfp-hardened.conf.template | 7 -- |
16 |
.../stage2-armv7a_hardfp-hardened.conf.template | 7 -- |
17 |
.../stage3-armv7a_hardfp-hardened.conf.template | 7 -- |
18 |
6 files changed, 184 deletions(-) |
19 |
|
20 |
diff --git a/tools-hardened/clean.sh b/tools-hardened/clean.sh |
21 |
deleted file mode 100755 |
22 |
index 916c4eb4..00000000 |
23 |
--- a/tools-hardened/clean.sh |
24 |
+++ /dev/null |
25 |
@@ -1,6 +0,0 @@ |
26 |
-#!/bin/bash |
27 |
- |
28 |
-# This just removes the temporary conf err and log |
29 |
-# files generated during a run |
30 |
- |
31 |
-rm -f *conf *err *log |
32 |
|
33 |
diff --git a/tools-hardened/common.sh b/tools-hardened/common.sh |
34 |
deleted file mode 100644 |
35 |
index 9a0a03af..00000000 |
36 |
--- a/tools-hardened/common.sh |
37 |
+++ /dev/null |
38 |
@@ -1,61 +0,0 @@ |
39 |
-#!/bin/bash |
40 |
- |
41 |
-source /etc/catalyst/catalyst.conf |
42 |
- |
43 |
-mydate=`date +%Y%m%d` |
44 |
- |
45 |
- |
46 |
-undo_grsec() { |
47 |
- [[ -d /proc/sys/kernel/grsecurity ]] || return |
48 |
- for i in /proc/sys/kernel/grsecurity/chroot_* ; do |
49 |
- echo 0 > $i |
50 |
- done |
51 |
-} |
52 |
- |
53 |
- |
54 |
-banner() { |
55 |
-cat << EOF | tee -a zzz.log > stage$1-$2-systemd.log |
56 |
- |
57 |
-************************************************************************ |
58 |
-* stage$1-$2-systemd |
59 |
-************************************************************************" |
60 |
- |
61 |
-EOF |
62 |
-} |
63 |
- |
64 |
- |
65 |
-do_stages() { |
66 |
- local arch=$1 |
67 |
- |
68 |
- for s in 1 2 3; do |
69 |
- local tgpath="${storedir}/builds/systemd/${arch}" |
70 |
- local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2" |
71 |
- local tglink="stage${s}-${arch}-systemd.tar.bz2" |
72 |
- |
73 |
- if [[ ! -f "${tgpath}/${tglink}" ]]; then |
74 |
- touch stage${s}-${arch}-systemd.log |
75 |
- echo "!!! ${tglink} at ${tgpath} doesn't exist" \ |
76 |
- | tee -a zzz.log \ |
77 |
- > stage${s}-${arch}-systemd.err |
78 |
- return 1 |
79 |
- fi |
80 |
- |
81 |
- banner ${s} ${arch} |
82 |
- catalyst -f stage${s}-${arch}-systemd.conf \ |
83 |
- | tee -a zzz.log \ |
84 |
- > stage${s}-${arch}-systemd.log \ |
85 |
- 2> stage${s}-${arch}-systemd.err |
86 |
- |
87 |
- if [[ -f "${tgpath}/${target}" ]]; then |
88 |
- rm -f "${tgpath}/${tglink}" |
89 |
- ln -s ${target} "${tgpath}/${tglink}" |
90 |
- else |
91 |
- echo "!!! ${target} was not generated" \ |
92 |
- | tee -a zzz.log \ |
93 |
- >stage${s}-${arch}-systemd.err |
94 |
- return 1 |
95 |
- fi |
96 |
- done |
97 |
- |
98 |
- return 0 |
99 |
-} |
100 |
|
101 |
diff --git a/tools-hardened/run-armv7a.sh b/tools-hardened/run-armv7a.sh |
102 |
deleted file mode 100755 |
103 |
index 8daccdf8..00000000 |
104 |
--- a/tools-hardened/run-armv7a.sh |
105 |
+++ /dev/null |
106 |
@@ -1,96 +0,0 @@ |
107 |
-#!/bin/bash |
108 |
- |
109 |
-source /etc/catalyst/catalyst.conf |
110 |
- |
111 |
-mydate=`date +%Y%m%d` |
112 |
- |
113 |
-prepare_confs() { |
114 |
- local arch=$1 |
115 |
- local flavor=$2 |
116 |
- |
117 |
- for s in 1 2 3; do |
118 |
- cat stage${s}-${arch}_hardfp-${flavor}.conf.template | \ |
119 |
- sed -e "s/\(^version_stamp.*$\)/\1-${mydate}/" > stage${s}-${arch}_hardfp-${flavor}.conf |
120 |
- done |
121 |
-} |
122 |
- |
123 |
-banner() { |
124 |
-cat << EOF | tee -a zzz.log > stage$1-$2_hardfp-$3.log |
125 |
- |
126 |
-************************************************************************ |
127 |
-* stage$1-$2_hardfp-$3 |
128 |
-************************************************************************" |
129 |
- |
130 |
-EOF |
131 |
-} |
132 |
- |
133 |
- |
134 |
-do_stages() { |
135 |
- local arch=$1 |
136 |
- local flavor=$2 |
137 |
- |
138 |
- for s in 1 2 3; do |
139 |
- local tgpath="${storedir}/builds/${flavor}/${arch}" |
140 |
- local target="stage${s}-${arch}_hardfp-${flavor}-${mydate}.tar.bz2" |
141 |
- local tglink="stage${s}-${arch}_hardfp-${flavor}.tar.bz2" |
142 |
- |
143 |
- if [[ ! -f "${tgpath}/${tglink}" ]]; then |
144 |
- touch stage${s}-${arch}_hardfp-${flavor}.log |
145 |
- echo "!!! ${target} at ${tgpath} doesn't exit" \ |
146 |
- | tee -a zzz.log \ |
147 |
- > stage${s}-${arch}_hardfp-${flavor}.err |
148 |
- return 1 |
149 |
- fi |
150 |
- |
151 |
- banner ${s} ${arch} ${flavor} |
152 |
- catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \ |
153 |
- | tee -a zzz.log \ |
154 |
- > stage${s}-${arch}_hardfp-${flavor}.log \ |
155 |
- 2> stage${s}-${arch}_hardfp-${flavor}.err |
156 |
- |
157 |
- if [[ -f "${tgpath}/${target}" ]]; then |
158 |
- rm -f "${tgpath}/${tglink}" |
159 |
- ln -s ${target} "${tgpath}/${tglink}" |
160 |
- else |
161 |
- echo "!!! ${target} was not generated" \ |
162 |
- | tee -a zzz.log \ |
163 |
- >stage${s}-${arch}_hardfp-${flavor}.err |
164 |
- return 1 |
165 |
- fi |
166 |
- done |
167 |
- |
168 |
- return 0 |
169 |
-} |
170 |
- |
171 |
- |
172 |
-# |
173 |
-# approximate timings: |
174 |
-# |
175 |
-# catalyst -s current 3 minutes |
176 |
-# catalyst -f stage1 130 minutes |
177 |
-# |
178 |
- |
179 |
-main() { |
180 |
- >zzz.log |
181 |
- |
182 |
- catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
183 |
- |
184 |
- for arch in armv7a; do |
185 |
- for flavor in hardened; do |
186 |
- prepare_confs ${arch} ${flavor} |
187 |
- done |
188 |
- done |
189 |
- |
190 |
- for arch in armv7a; do |
191 |
- for flavor in hardened; do |
192 |
- do_stages ${arch} ${flavor} |
193 |
- ret=$? |
194 |
- if [[ $? == 1 ]]; then |
195 |
- echo "FAILURE at ${arch} ${flavor}" | tee zzz.log |
196 |
- return 1 |
197 |
- fi |
198 |
- done |
199 |
- done |
200 |
-} |
201 |
- |
202 |
-main $1 & |
203 |
|
204 |
diff --git a/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template |
205 |
deleted file mode 100644 |
206 |
index c21db83d..00000000 |
207 |
--- a/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template |
208 |
+++ /dev/null |
209 |
@@ -1,7 +0,0 @@ |
210 |
-subarch: armv7a_hardfp |
211 |
-target: stage1 |
212 |
-version_stamp: hardened |
213 |
-rel_type: hardened/armv7a |
214 |
-profile: hardened/linux/arm/armv7a |
215 |
-snapshot: current |
216 |
-source_subpath: hardened/armv7a/stage3-armv7a_hardfp-hardened |
217 |
|
218 |
diff --git a/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template |
219 |
deleted file mode 100644 |
220 |
index 30110c1a..00000000 |
221 |
--- a/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template |
222 |
+++ /dev/null |
223 |
@@ -1,7 +0,0 @@ |
224 |
-subarch: armv7a_hardfp |
225 |
-target: stage2 |
226 |
-version_stamp: hardened |
227 |
-rel_type: hardened/armv7a |
228 |
-profile: hardened/linux/arm/armv7a |
229 |
-snapshot: current |
230 |
-source_subpath: hardened/armv7a/stage1-armv7a_hardfp-hardened |
231 |
|
232 |
diff --git a/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template |
233 |
deleted file mode 100644 |
234 |
index b52059b8..00000000 |
235 |
--- a/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template |
236 |
+++ /dev/null |
237 |
@@ -1,7 +0,0 @@ |
238 |
-subarch: armv7a_hardfp |
239 |
-target: stage3 |
240 |
-version_stamp: hardened |
241 |
-rel_type: hardened/armv7a |
242 |
-profile: hardened/linux/arm/armv7a |
243 |
-snapshot: current |
244 |
-source_subpath: hardened/armv7a/stage2-armv7a_hardfp-hardened |