1 |
commit: d70057496ea43cadab0426afa7918a5408ef1854 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 1 03:57:41 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 1 03:58:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7005749 |
7 |
|
8 |
config/old: Remove |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
config/README | 2 -- |
13 |
config/old/active-release | 1 - |
14 |
config/old/amd64-default.conf | 9 --------- |
15 |
config/old/amd64-default.env | 3 --- |
16 |
config/old/amd64-dev.conf | 9 --------- |
17 |
config/old/amd64-hardened.conf | 9 --------- |
18 |
config/old/amd64-hardened.env | 7 ------- |
19 |
config/old/amd64-uclibc.conf | 9 --------- |
20 |
config/old/amd64-uclibc.env | 1 - |
21 |
config/old/snapshot-official.conf | 7 ------- |
22 |
config/old/x86-default.conf | 9 --------- |
23 |
config/old/x86-default.env | 4 ---- |
24 |
config/old/x86-dev.conf | 9 --------- |
25 |
config/old/x86-hardened.conf | 9 --------- |
26 |
config/old/x86-hardened.env | 5 ----- |
27 |
config/old/x86-uclibc.conf | 9 --------- |
28 |
config/old/x86-uclibc.env | 4 ---- |
29 |
17 files changed, 106 deletions(-) |
30 |
|
31 |
diff --git a/config/README b/config/README |
32 |
index 93cbf3dc..22badd08 100644 |
33 |
--- a/config/README |
34 |
+++ b/config/README |
35 |
@@ -2,8 +2,6 @@ This directory houses the config files for catalyst to be used by releng |
36 |
build boxes. To use these config files, add a symlink in a build box from |
37 |
/etc/catalyst/release to this dir. |
38 |
|
39 |
-Old config files that serve as examples are stores in the old subdir. |
40 |
- |
41 |
Changes to these files should be discussed with the members responsible |
42 |
for individual build boxes / arches or with the RelEng team. |
43 |
|
44 |
|
45 |
diff --git a/config/old/active-release b/config/old/active-release |
46 |
deleted file mode 100644 |
47 |
index 4a70890b..00000000 |
48 |
--- a/config/old/active-release |
49 |
+++ /dev/null |
50 |
@@ -1 +0,0 @@ |
51 |
-2008.0 |
52 |
|
53 |
diff --git a/config/old/amd64-default.conf b/config/old/amd64-default.conf |
54 |
deleted file mode 100644 |
55 |
index 92647308..00000000 |
56 |
--- a/config/old/amd64-default.conf |
57 |
+++ /dev/null |
58 |
@@ -1,9 +0,0 @@ |
59 |
-distdir="/usr/portage/distfiles" |
60 |
-portdir="/release/portage" |
61 |
-options="pkgcache autoresume snapcache seedcache kerncache" |
62 |
-sharedir="/usr/lib/catalyst/" |
63 |
-storedir="/release/buildroot/amd64-default" |
64 |
-envscript="/etc/catalyst/amd64-default.env" |
65 |
-hash_function="crc32" |
66 |
-digests="md5 sha1" |
67 |
-contents="auto" |
68 |
|
69 |
diff --git a/config/old/amd64-default.env b/config/old/amd64-default.env |
70 |
deleted file mode 100644 |
71 |
index d130ae5a..00000000 |
72 |
--- a/config/old/amd64-default.env |
73 |
+++ /dev/null |
74 |
@@ -1,3 +0,0 @@ |
75 |
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/" |
76 |
-export INPUT_DEVICES="evdev keyboard mouse vmmouse" |
77 |
-export MAKEOPTS="-j4" |
78 |
|
79 |
diff --git a/config/old/amd64-dev.conf b/config/old/amd64-dev.conf |
80 |
deleted file mode 100644 |
81 |
index d15a803f..00000000 |
82 |
--- a/config/old/amd64-dev.conf |
83 |
+++ /dev/null |
84 |
@@ -1,9 +0,0 @@ |
85 |
-distdir="/usr/portage/distfiles" |
86 |
-portdir="/release/portage" |
87 |
-options="ccache pkgcache autoresume snapcache seedcache kerncache" |
88 |
-sharedir="/usr/lib/catalyst/" |
89 |
-storedir="/release/buildroot/amd64-dev" |
90 |
-envscript="/etc/catalyst/amd64-dev.env" |
91 |
-hash_function="crc32" |
92 |
-digests="md5 sha1" |
93 |
-contents="auto" |
94 |
|
95 |
diff --git a/config/old/amd64-hardened.conf b/config/old/amd64-hardened.conf |
96 |
deleted file mode 100644 |
97 |
index 20c39a0b..00000000 |
98 |
--- a/config/old/amd64-hardened.conf |
99 |
+++ /dev/null |
100 |
@@ -1,9 +0,0 @@ |
101 |
-distdir="/usr/portage/distfiles" |
102 |
-portdir="/release/portage" |
103 |
-options="ccache pkgcache autoresume snapcache seedcache kerncache" |
104 |
-sharedir="/usr/lib/catalyst/" |
105 |
-storedir="/release/buildroot/amd64-hardened" |
106 |
-envscript="/etc/catalyst/amd64-hardened.env" |
107 |
-hash_function="crc32" |
108 |
-digests="md5 sha1" |
109 |
-contents="auto" |
110 |
|
111 |
diff --git a/config/old/amd64-hardened.env b/config/old/amd64-hardened.env |
112 |
deleted file mode 100644 |
113 |
index fe933ce0..00000000 |
114 |
--- a/config/old/amd64-hardened.env |
115 |
+++ /dev/null |
116 |
@@ -1,7 +0,0 @@ |
117 |
-export CFLAGS="-O2 -pipe" |
118 |
-export CXXFLAGS="${CFLAGS}" |
119 |
-export CHOS="x86_64-pc-linux-gnu" |
120 |
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/" |
121 |
-export MAKEOPTS="-j3" |
122 |
-# Jorge Vicetto - testing for hardened builds |
123 |
-#export MAKEOPTS="-j6" |
124 |
|
125 |
diff --git a/config/old/amd64-uclibc.conf b/config/old/amd64-uclibc.conf |
126 |
deleted file mode 100644 |
127 |
index eb46f361..00000000 |
128 |
--- a/config/old/amd64-uclibc.conf |
129 |
+++ /dev/null |
130 |
@@ -1,9 +0,0 @@ |
131 |
-distdir="/usr/portage/distfiles" |
132 |
-portdir="/release/portage" |
133 |
-options="ccache pkgcache autoresume snapcache seedcache kerncache" |
134 |
-sharedir="/usr/lib/catalyst/" |
135 |
-storedir="/release/buildroot/amd64-uclibc" |
136 |
-envscript="/etc/catalyst/amd64-uclibc.env" |
137 |
-hash_function="crc32" |
138 |
-digests="md5 sha1" |
139 |
-contents="auto" |
140 |
|
141 |
diff --git a/config/old/amd64-uclibc.env b/config/old/amd64-uclibc.env |
142 |
deleted file mode 100644 |
143 |
index a1c428c6..00000000 |
144 |
--- a/config/old/amd64-uclibc.env |
145 |
+++ /dev/null |
146 |
@@ -1 +0,0 @@ |
147 |
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/" |
148 |
|
149 |
diff --git a/config/old/snapshot-official.conf b/config/old/snapshot-official.conf |
150 |
deleted file mode 100644 |
151 |
index 8db59586..00000000 |
152 |
--- a/config/old/snapshot-official.conf |
153 |
+++ /dev/null |
154 |
@@ -1,7 +0,0 @@ |
155 |
-distdir="/usr/portage/distfiles" |
156 |
-#portdir="/release/snapshot-tree/2008.0/portage" |
157 |
-sharedir="/usr/lib/catalyst" |
158 |
-storedir="/release" |
159 |
-hash_function="crc32" |
160 |
-digests="md5 sha1" |
161 |
-contents="auto" |
162 |
|
163 |
diff --git a/config/old/x86-default.conf b/config/old/x86-default.conf |
164 |
deleted file mode 100644 |
165 |
index daee9e92..00000000 |
166 |
--- a/config/old/x86-default.conf |
167 |
+++ /dev/null |
168 |
@@ -1,9 +0,0 @@ |
169 |
-distdir="/usr/portage/distfiles" |
170 |
-portdir="/release/portage" |
171 |
-options="ccache pkgcache autoresume snapcache seedcache kerncache" |
172 |
-sharedir="/usr/lib/catalyst/" |
173 |
-storedir="/release/buildroot/x86-default" |
174 |
-envscript="/etc/catalyst/x86-default.env" |
175 |
-hash_function="crc32" |
176 |
-digests="md5 sha1" |
177 |
-contents="auto" |
178 |
|
179 |
diff --git a/config/old/x86-default.env b/config/old/x86-default.env |
180 |
deleted file mode 100644 |
181 |
index 5966120f..00000000 |
182 |
--- a/config/old/x86-default.env |
183 |
+++ /dev/null |
184 |
@@ -1,4 +0,0 @@ |
185 |
-export CFLAGS="-Os -mcpu=i686 -pipe -fomit-frame-pointer" |
186 |
-export CXXFLAGS="${CFLAGS}" |
187 |
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/" |
188 |
-export MAKEOPTS="-j16" |
189 |
|
190 |
diff --git a/config/old/x86-dev.conf b/config/old/x86-dev.conf |
191 |
deleted file mode 100644 |
192 |
index 0186c0d0..00000000 |
193 |
--- a/config/old/x86-dev.conf |
194 |
+++ /dev/null |
195 |
@@ -1,9 +0,0 @@ |
196 |
-distdir="/usr/portage/distfiles" |
197 |
-portdir="/release/portage" |
198 |
-options="ccache pkgcache autoresume snapcache seedcache kerncache" |
199 |
-sharedir="/usr/lib/catalyst/" |
200 |
-storedir="/release/buildroot/x86-dev" |
201 |
-envscript="/etc/catalyst/x86-dev.env" |
202 |
-hash_function="crc32" |
203 |
-digests="md5 sha1" |
204 |
-contents="auto" |
205 |
|
206 |
diff --git a/config/old/x86-hardened.conf b/config/old/x86-hardened.conf |
207 |
deleted file mode 100644 |
208 |
index c7582f29..00000000 |
209 |
--- a/config/old/x86-hardened.conf |
210 |
+++ /dev/null |
211 |
@@ -1,9 +0,0 @@ |
212 |
-distdir="/usr/portage/distfiles" |
213 |
-portdir="/release/portage" |
214 |
-options="ccache pkgcache autoresume snapcache seedcache kerncache" |
215 |
-sharedir="/usr/lib/catalyst/" |
216 |
-storedir="/release/buildroot/x86-hardened" |
217 |
-envscript="/etc/catalyst/x86-hardened.env" |
218 |
-hash_function="crc32" |
219 |
-digests="md5 sha1" |
220 |
-contents="auto" |
221 |
|
222 |
diff --git a/config/old/x86-hardened.env b/config/old/x86-hardened.env |
223 |
deleted file mode 100644 |
224 |
index 6f2e505c..00000000 |
225 |
--- a/config/old/x86-hardened.env |
226 |
+++ /dev/null |
227 |
@@ -1,5 +0,0 @@ |
228 |
-export CFLAGS="-O2 -pipe" |
229 |
-export CXXFLAGS="${CFLAGS}" |
230 |
-export CHOST="i386-pc-linux-gnu" |
231 |
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/" |
232 |
-export MAKEOPTS="-j6" |
233 |
|
234 |
diff --git a/config/old/x86-uclibc.conf b/config/old/x86-uclibc.conf |
235 |
deleted file mode 100644 |
236 |
index 1fe6a8d7..00000000 |
237 |
--- a/config/old/x86-uclibc.conf |
238 |
+++ /dev/null |
239 |
@@ -1,9 +0,0 @@ |
240 |
-distdir="/usr/portage/distfiles" |
241 |
-portdir="/release/portage" |
242 |
-options="ccache pkgcache autoresume snapcache seedcache kerncache" |
243 |
-sharedir="/usr/lib/catalyst/" |
244 |
-storedir="/release/buildroot/x86-uclibc" |
245 |
-envscript="/etc/catalyst/x86-uclibc.env" |
246 |
-hash_function="crc32" |
247 |
-digests="md5 sha1" |
248 |
-contents="auto" |
249 |
|
250 |
diff --git a/config/old/x86-uclibc.env b/config/old/x86-uclibc.env |
251 |
deleted file mode 100644 |
252 |
index 0e1b92c0..00000000 |
253 |
--- a/config/old/x86-uclibc.env |
254 |
+++ /dev/null |
255 |
@@ -1,4 +0,0 @@ |
256 |
-export CFLAGS="-Os -pipe -fomit-frame-pointer" |
257 |
-export CHOST="i386-pc-linux-uclibc" |
258 |
-export CXXFLAGS="${CFLAGS}" |
259 |
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/" |