1 |
commit: 9eac042d5e39ea30a6d26468218fa2151faf2ad8 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 29 00:44:10 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 29 01:35:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9eac042d |
7 |
|
8 |
catalyst: Delete Gentoo Reference Platform target |
9 |
|
10 |
Unused for 12 years. |
11 |
|
12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
13 |
|
14 |
README | 1 - |
15 |
catalyst/defaults.py | 2 +- |
16 |
catalyst/targets/grp.py | 97 ---------------------------------- |
17 |
doc/catalyst-spec.5.txt | 24 +-------- |
18 |
doc/catalyst.1.txt | 6 +-- |
19 |
examples/grp_template.spec | 117 ----------------------------------------- |
20 |
targets/grp/chroot.sh | 21 -------- |
21 |
targets/grp/controller.sh | 34 ------------ |
22 |
targets/grp/preclean-chroot.sh | 7 --- |
23 |
9 files changed, 5 insertions(+), 304 deletions(-) |
24 |
|
25 |
diff --git a/README b/README |
26 |
index 6dc6a149..b398fe30 100644 |
27 |
--- a/README |
28 |
+++ b/README |
29 |
@@ -34,7 +34,6 @@ Catalyst is capable of: |
30 |
|
31 |
- Building installation stages |
32 |
- Building bootable LiveCDs |
33 |
-- Building GRP (Gentoo Reference Platform) sets |
34 |
- Setting up a Tinderbox target for test building |
35 |
- Building netboot images |
36 |
|
37 |
|
38 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
39 |
index 705ae931..568d8566 100644 |
40 |
--- a/catalyst/defaults.py |
41 |
+++ b/catalyst/defaults.py |
42 |
@@ -17,7 +17,7 @@ required_build_targets = ["targetbase", "generic_stage_target"] |
43 |
|
44 |
# new build types should be added here |
45 |
valid_build_targets = ["stage1_target", "stage2_target", "stage3_target", |
46 |
- "stage4_target", "grp_target", "livecd_stage1_target", "livecd_stage2_target", |
47 |
+ "stage4_target", "livecd_stage1_target", "livecd_stage2_target", |
48 |
"embedded_target", "tinderbox_target", "snapshot_target", "netboot_target", |
49 |
"netboot2_target" |
50 |
] |
51 |
|
52 |
diff --git a/catalyst/targets/grp.py b/catalyst/targets/grp.py |
53 |
deleted file mode 100644 |
54 |
index d47654d0..00000000 |
55 |
--- a/catalyst/targets/grp.py |
56 |
+++ /dev/null |
57 |
@@ -1,97 +0,0 @@ |
58 |
-""" |
59 |
-Gentoo Reference Platform (GRP) target |
60 |
-""" |
61 |
-# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
62 |
- |
63 |
-import os |
64 |
-import glob |
65 |
- |
66 |
-from catalyst import log |
67 |
-from catalyst.support import (CatalystError, normpath, cmd) |
68 |
-from catalyst.base.stagebase import StageBase |
69 |
- |
70 |
- |
71 |
-class grp(StageBase): |
72 |
- """ |
73 |
- The builder class for GRP (Gentoo Reference Platform) builds. |
74 |
- """ |
75 |
- def __init__(self,spec,addlargs): |
76 |
- self.required_values=["version_stamp","target","subarch",\ |
77 |
- "rel_type","profile","snapshot","source_subpath"] |
78 |
- |
79 |
- self.valid_values=self.required_values[:] |
80 |
- self.valid_values.extend(["grp/use"]) |
81 |
- if "grp" not in addlargs: |
82 |
- raise CatalystError("Required value \"grp\" not specified in spec.") |
83 |
- |
84 |
- self.required_values.extend(["grp"]) |
85 |
- if isinstance(addlargs['grp'], str): |
86 |
- addlargs["grp"]=[addlargs["grp"]] |
87 |
- |
88 |
- if "grp/use" in addlargs: |
89 |
- if isinstance(addlargs['grp/use'], str): |
90 |
- addlargs["grp/use"]=[addlargs["grp/use"]] |
91 |
- |
92 |
- for x in addlargs["grp"]: |
93 |
- self.required_values.append("grp/"+x+"/packages") |
94 |
- self.required_values.append("grp/"+x+"/type") |
95 |
- |
96 |
- StageBase.__init__(self,spec,addlargs) |
97 |
- |
98 |
- def run_local(self): |
99 |
- for pkgset in self.settings["grp"]: |
100 |
- # example call: "grp.sh run pkgset cd1 xmms vim sys-apps/gleep" |
101 |
- try: |
102 |
- cmd([self.settings['controller_file'], 'run', |
103 |
- self.settings['grp/' + pkgset + '/type'], |
104 |
- pkgset] + self.settings['grp/' + pkgset + '/packages'], |
105 |
- env=self.env) |
106 |
- |
107 |
- except CatalystError: |
108 |
- self.unbind() |
109 |
- raise CatalystError("GRP build aborting due to error.", |
110 |
- print_traceback=True) |
111 |
- |
112 |
- def set_mounts(self): |
113 |
- self.mounts.append("/tmp/grp") |
114 |
- self.mountmap["/tmp/grp"]=self.settings["target_path"] |
115 |
- |
116 |
- def generate_digests(self): |
117 |
- for pkgset in self.settings["grp"]: |
118 |
- if self.settings["grp/"+pkgset+"/type"] == "pkgset": |
119 |
- destdir=normpath(self.settings["target_path"]+"/"+pkgset+"/All") |
120 |
- log.notice('Digesting files in the pkgset...') |
121 |
- digests=glob.glob(destdir+'/*.DIGESTS') |
122 |
- for i in digests: |
123 |
- if os.path.exists(i): |
124 |
- os.remove(i) |
125 |
- |
126 |
- files=os.listdir(destdir) |
127 |
- #ignore files starting with '.' using list comprehension |
128 |
- files=[filename for filename in files if filename[0] != '.'] |
129 |
- for i in files: |
130 |
- if os.path.isfile(normpath(destdir+"/"+i)): |
131 |
- self.gen_contents_file(normpath(destdir+"/"+i)) |
132 |
- self.gen_digest_file(normpath(destdir+"/"+i)) |
133 |
- else: |
134 |
- destdir=normpath(self.settings["target_path"]+"/"+pkgset) |
135 |
- log.notice('Digesting files in the srcset...') |
136 |
- |
137 |
- digests=glob.glob(destdir+'/*.DIGESTS') |
138 |
- for i in digests: |
139 |
- if os.path.exists(i): |
140 |
- os.remove(i) |
141 |
- |
142 |
- files=os.listdir(destdir) |
143 |
- #ignore files starting with '.' using list comprehension |
144 |
- files=[filename for filename in files if filename[0] != '.'] |
145 |
- for i in files: |
146 |
- if os.path.isfile(normpath(destdir+"/"+i)): |
147 |
- #self.gen_contents_file(normpath(destdir+"/"+i)) |
148 |
- self.gen_digest_file(normpath(destdir+"/"+i)) |
149 |
- |
150 |
- def set_action_sequence(self): |
151 |
- self.settings["action_sequence"]=["unpack","unpack_snapshot",\ |
152 |
- "config_profile_link","setup_confdir","portage_overlay","bind","chroot_setup",\ |
153 |
- "setup_environment","run_local","unbind",\ |
154 |
- "generate_digests","clear_autoresume"] |
155 |
|
156 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
157 |
index 6c71b57b..7383afe8 100644 |
158 |
--- a/doc/catalyst-spec.5.txt |
159 |
+++ b/doc/catalyst-spec.5.txt |
160 |
@@ -126,11 +126,6 @@ releases, we use a default README.txt, and this will be used on your |
161 |
CD if you do not provide one yourself. We do not use this for the |
162 |
official releases. This setting is supported by the livecd targets. |
163 |
|
164 |
-*grp*:: |
165 |
-Since GRP is capable of building packages/source sets for more than |
166 |
-one CD, this defines the layout for the directories under |
167 |
-`$storedir/builds` (example: `src cd2`). |
168 |
- |
169 |
*update_seed*:: |
170 |
This is an optional setting supported by stage1 to tell catalyst if |
171 |
it should update the seed stage or not (valid values: `yes no`). |
172 |
@@ -349,7 +344,7 @@ quite a few problems with these, so be careful with whatever `USE` |
173 |
flags you add here. This is generally used for adding some |
174 |
functionality that we do not want on by default for all Gentoo users, |
175 |
but that we want on by default in our binaries. This setting is |
176 |
-supported by the `stage4`, `netboot2`, `tinderbox`, and `grp` targets. |
177 |
+supported by the `stage4`, `netboot2`, and `tinderbox` targets. |
178 |
|
179 |
*<target>/packages*:: |
180 |
This is the set of packages that we will merge into the stage4 tarball |
181 |
@@ -395,23 +390,6 @@ There are no checks on these packages, so be careful what you add |
182 |
here. They can potentially break your target. This setting is |
183 |
supported by the `stage4` and `livecd` targets. |
184 |
|
185 |
-*grp/<label>/type*:: |
186 |
-This tells catalyst what type of GRP set this list of packages will |
187 |
-create (example: `srcset`). Valid options here are `srcset` or |
188 |
-`pkgset` to either download the source, or to build packages, |
189 |
-respectively. `<label>` should match one of the labels given to |
190 |
-*grp*. |
191 |
- |
192 |
-*grp/<label>/packages*:: |
193 |
-This is our list of packages that will comprise our package set |
194 |
-(example: `dante tsocks sys-apps/eject minicom`). Packages listed for |
195 |
-a `srcset` label should be used for grabbing things that need a |
196 |
-compiled kernel to build, or things listed in the Handbook that should |
197 |
-be available before the first reboot during an install. Pagekages |
198 |
-listed for a `pkgset` label will be fetched, compiled, and installed |
199 |
-in the target. `<label>` should match one of the labels given to |
200 |
-*grp*. |
201 |
- |
202 |
Miscellaneous |
203 |
~~~~~~~~~~~~~ |
204 |
|
205 |
|
206 |
diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt |
207 |
index dc6c7acb..9c52878c 100644 |
208 |
--- a/doc/catalyst.1.txt |
209 |
+++ b/doc/catalyst.1.txt |
210 |
@@ -18,9 +18,9 @@ DESCRIPTION |
211 |
----------- |
212 |
*catalyst* is the tool that the Gentoo Release Engineering team |
213 |
utilizes to build all Gentoo Linux releases. It is capable of building |
214 |
-installation stages, bootable LiveCDs, netboot images, and Gentoo Reference |
215 |
-Platform (GRP) sets. *catalyst* is also capable of providing a simple |
216 |
-tinderbox environment for ebuild/package testing. |
217 |
+installation stages, bootable LiveCDs, and netboot images. *catalyst* |
218 |
+is also capable of providing a simple tinderbox environment for package |
219 |
+testing. |
220 |
|
221 |
For more information, please visit the *catalyst* project page |
222 |
on the web at 'https://wiki.gentoo.org/wiki/Catalyst'. |
223 |
|
224 |
diff --git a/examples/grp_template.spec b/examples/grp_template.spec |
225 |
deleted file mode 100644 |
226 |
index 3a0e15a8..00000000 |
227 |
--- a/examples/grp_template.spec |
228 |
+++ /dev/null |
229 |
@@ -1,117 +0,0 @@ |
230 |
-# generic GRP (Gentoo Reference Platform) specfile |
231 |
-# used to build a GRP set |
232 |
- |
233 |
-# The subarch can be any of the supported catalyst subarches (like athlon-xp). |
234 |
-# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst> |
235 |
-# for supported subarches |
236 |
-# example: |
237 |
-# subarch: athlon-xp |
238 |
-subarch: |
239 |
- |
240 |
-# The version stamp is an identifier for the build. It can be anything you wish |
241 |
-# it to be, but it is usually a date. |
242 |
-# example: |
243 |
-# version_stamp: 2006.1 |
244 |
-version_stamp: |
245 |
- |
246 |
-# The target specifies what target we want catalyst to do. For GRP, the |
247 |
-# supported targets are: grp |
248 |
-# example: |
249 |
-# target: grp |
250 |
-target: grp |
251 |
- |
252 |
-# The rel_type defines what kind of build we are doing. This is merely another |
253 |
-# identifier, but it useful for allowing multiple concurrent builds. Usually, |
254 |
-# default will suffice. |
255 |
-# example: |
256 |
-# rel_type: default |
257 |
-rel_type: |
258 |
- |
259 |
-# This is the system profile to be used by catalyst to build this target. It is |
260 |
-# specified as a relative path from /var/db/repos/gentoo/profiles. |
261 |
-# example: |
262 |
-# profile: default-linux/x86/2006.1 |
263 |
-profile: |
264 |
- |
265 |
-# This specifies which snapshot to use for building this target. |
266 |
-# example: |
267 |
-# snapshot: 2006.1 |
268 |
-snapshot: |
269 |
- |
270 |
-# This specifies where the seed stage comes from for this target, The path is |
271 |
-# relative to $clst_sharedir/builds. The rel_type is also used as a path prefix |
272 |
-# for the seed. |
273 |
-# example: |
274 |
-# default/stage3-x86-2006.1 |
275 |
-source_subpath: |
276 |
- |
277 |
-# These are the hosts used as distcc slaves when distcc is enabled in your |
278 |
-# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and |
279 |
-# is entirely optional. |
280 |
-# example: |
281 |
-# distcc_hosts: 127.0.0.1 192.168.0.1 |
282 |
-distcc_hosts: |
283 |
- |
284 |
-# This is an optional directory containing portage configuration files. It |
285 |
-# follows the same syntax as /etc/portage and should be consistent across all |
286 |
-# targets to minimize problems. |
287 |
-# example: |
288 |
-# portage_confdir: /etc/portage |
289 |
-portage_confdir: |
290 |
- |
291 |
-# This option specifies the location to a portage overlay that you would like to |
292 |
-# have used when building this target. |
293 |
-# example: |
294 |
-# portage_overlay: /usr/local/portage |
295 |
-portage_overlay: |
296 |
- |
297 |
-# This allows the optional directory containing the output packages for |
298 |
-# catalyst. Mainly used as a way for different spec files to access the same |
299 |
-# cache directory. Default behavior is for this location to be autogenerated |
300 |
-# by catalyst based on the spec file. |
301 |
-# example: |
302 |
-# pkgcache_path: /tmp/packages |
303 |
-pkgcache_path: |
304 |
- |
305 |
-# Since GRP is capable of building packages/source sets for more than one CD, |
306 |
-# this defines the layout for the directories under $clst_sharedir/builds. |
307 |
-# example: |
308 |
-# grp: src cd2 |
309 |
-grp: src cd2 |
310 |
- |
311 |
-# GRP is also able to build packages with customized USE settings. However, it |
312 |
-# is very possible to cause quite a few problems with these, so be careful with |
313 |
-# whatever USE flags you add here. This is generally used for adding some |
314 |
-# functionality that we do not want on by default for all Gentoo users, but that |
315 |
-# we want on by default in our binaries. Some examples would be things like the |
316 |
-# socks5 USE flag. |
317 |
-# example: |
318 |
-# grp/use: gtk2 gnome kde qt bonobo cdr esd gtkhtml mozilla mysql perl ruby tcltk cups ldap ssl tcpd -svga |
319 |
-grp/use: |
320 |
- |
321 |
-# This tells catalyst what type of GRP set this list of packages will create. |
322 |
-# Valid options here are srcset or pkgset to either download the source, or to |
323 |
-# build packages, respectively. |
324 |
-# example: |
325 |
-# grp/src/type: srcset |
326 |
-grp/src/type: |
327 |
- |
328 |
-# Since this is a srcset, these ebuilds will have their distfiles fetched and |
329 |
-# the distfiles will be stored in the src directory under $clst_sharedir/builds. |
330 |
-# Packages will not be made out of this list. We use this for grabbing things |
331 |
-# that need a compiled kernel to build, or things listed in the Handbook that |
332 |
-# should be available before the first reboot during an install. |
333 |
-# example: |
334 |
-# grp/src/packages: gentoo-sources udev vanilla-sources rp-pppoe speedtouch fcdsl fritzcapi globespan-adsl pptpclient slmodem lvm2 evms iputils vixie-cron fcron dcron sysklogd metalog syslog-ng raidtools jfsutils xfsprogs reiserfsprogs dosfstools ntfsprogs lilo grub isdn4k-utils iproute2 wireless-tools wpa_supplicant pcmcia-cs hotplug coldplug dhcpcd slocate genkernel ipw2100 ipw2200 fxload logrotate |
335 |
-grp/src/packages: |
336 |
- |
337 |
-# This is mostly here for completeness. This is the pkgset definition. |
338 |
-# example: |
339 |
-# grp/cd2/type: pkgset |
340 |
-grp/cd2/type: |
341 |
- |
342 |
-# This is our list of packages that will comprise our package set. These are |
343 |
-# fetched, compiled, and the packages are stored under $clst_sharedir/builds. |
344 |
-# example: |
345 |
-# grp/cd2/packages: dante tsocks sys-apps/eject minicom links acpid apmd parted whois tcpdump cvs zip unzip netcat partimage app-admin/sudo app-cdr/cdrtools gnome emacs dev-lang/ruby enlightenment kde mozilla-firefox mozilla-thunderbird xfce4 openbox fluxbox sylpheed openoffice-bin gimp xemacs xmms abiword gaim xchat pan tetex xcdroast k3b samba nmap gradm ettercap ethereal mplayer |
346 |
-grp/cd2/packages: |
347 |
|
348 |
diff --git a/targets/grp/chroot.sh b/targets/grp/chroot.sh |
349 |
deleted file mode 100755 |
350 |
index 6690c91b..00000000 |
351 |
--- a/targets/grp/chroot.sh |
352 |
+++ /dev/null |
353 |
@@ -1,21 +0,0 @@ |
354 |
-#!/bin/bash |
355 |
- |
356 |
-source /tmp/chroot-functions.sh |
357 |
- |
358 |
-## START BUILD |
359 |
-setup_pkgmgr |
360 |
- |
361 |
-export DISTDIR="/tmp/grp/${clst_grp_target}" |
362 |
-export PKGDIR="/tmp/grp/${clst_grp_target}" |
363 |
- |
364 |
-if [ "${clst_grp_type}" = "pkgset" ] |
365 |
-then |
366 |
- export clst_myemergeopts="${clst_myemergeopts} --noreplace" |
367 |
-else |
368 |
- export clst_FETCH=1 |
369 |
- # This is necessary since we're setting the above variable and the emerge |
370 |
- # opts have already been set |
371 |
- setup_myemergeopts |
372 |
-fi |
373 |
- |
374 |
-run_merge ${clst_grp_packages} || exit 1 |
375 |
|
376 |
diff --git a/targets/grp/controller.sh b/targets/grp/controller.sh |
377 |
deleted file mode 100755 |
378 |
index 0f1a5b5b..00000000 |
379 |
--- a/targets/grp/controller.sh |
380 |
+++ /dev/null |
381 |
@@ -1,34 +0,0 @@ |
382 |
-#!/bin/bash |
383 |
- |
384 |
-source ${clst_shdir}/support/functions.sh |
385 |
- |
386 |
-case $1 in |
387 |
- enter) |
388 |
- ${clst_CHROOT} ${clst_chroot_path} |
389 |
- ;; |
390 |
- |
391 |
- run) |
392 |
- shift |
393 |
- export clst_grp_type=$1 |
394 |
- shift |
395 |
- export clst_grp_target=$1 |
396 |
- shift |
397 |
- |
398 |
- export clst_grp_packages="$*" |
399 |
- exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh |
400 |
- ;; |
401 |
- |
402 |
- preclean) |
403 |
- exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh |
404 |
- ;; |
405 |
- |
406 |
- clean) |
407 |
- exit 0 |
408 |
- ;; |
409 |
- |
410 |
- *) |
411 |
- exit 1 |
412 |
- ;; |
413 |
- |
414 |
-esac |
415 |
-exit $? |
416 |
|
417 |
diff --git a/targets/grp/preclean-chroot.sh b/targets/grp/preclean-chroot.sh |
418 |
deleted file mode 100755 |
419 |
index 98c166fe..00000000 |
420 |
--- a/targets/grp/preclean-chroot.sh |
421 |
+++ /dev/null |
422 |
@@ -1,7 +0,0 @@ |
423 |
-#!/bin/bash |
424 |
- |
425 |
-source /tmp/chroot-functions.sh |
426 |
- |
427 |
-cleanup_stages |
428 |
- |
429 |
-gconftool-2 --shutdown |