[gentoo-commits] proj/catalyst:wip/mattst88 commit in: etc/

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: etc/

[Matt Turner]

commit:     2df1a70f61226f674473b0dc37f4b5aeb4e4777a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 03:18:21 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:51:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2df1a70f

catalyst: Convert catalyst.conf to TOML

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 etc/catalyst.conf | 90 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index f64fe971..8fa17fe2 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -10,45 +10,61 @@
 #
 #     $ python3 -c 'import hashlib; print(hashlib.algorithms_available)'
 #
-digests="blake2b sha512"
+digests = ["blake2b", "sha512"]
 
 # envscript allows users to set options such as http proxies, MAKEOPTS,
 # GENTOO_MIRRORS, or any other environment variables needed for building.
 # The envscript file sets environment variables like so:
 # export FOO="bar"
-envscript="/etc/catalyst/catalystrc"
-
-# options set different build-time options for catalyst. Some examples are:
-# autoresume = Attempt to resume a failed build, clear the autoresume flags with
-#	the -a option to the catalyst cmdline.  -p will clear the autoresume flags
-#	as well as your pkgcache and kerncache
-#	( This option is not fully tested, bug reports welcome )
-# bindist = enables the bindist USE flag, please see package specific definition,
-#	however, it is suggested to enable this if redistributing builds.
-#	This optional USE flag is normally cleaned from the make.conf file on
-#	completion of the stage.  For a non-cleaned version,
-#	use sticky-config also (see below)
-# ccache = enables build time ccache support
-# distcc = enable distcc support for building. You have to set distcc_hosts in
-#	your spec file.
-# icecream = enables icecream compiler cluster support for building
-# keepwork = Prevents the removal of the working chroot path and any autoresume
-#	files or points.
-# kerncache = keeps a tbz2 of your built kernel and modules (useful if your
-#	build stops in livecd-stage2)
-# pkgcache = keeps a tbz2 of every built package (useful if your build stops
-#	prematurely)
-# seedcache = use the build output of a previous target if it exists to speed up
-#	the copy
-# sticky-config = enables the code that will keep any internal 'catalyst_use' flags
-#	added to the USE= for building the stage.  These are usually added for legal
-#	or specific needs in building the the early stage.  Mostly it is the
-#	'bindist' USE flag option that is used for legal reasons, please see its
-#	specific definition.  It will also keep any /etc/portage/package.*
-#	files or directories.
-#
-# (These options can be used together)
-options="autoresume bindist kerncache pkgcache seedcache"
+envscript = "/etc/catalyst/catalystrc"
+
+# options set different build-time options for catalyst.
+options = [
+	# Attempt to resume a failed build, clear the autoresume flags with the
+	# -a option to the catalyst cmdline.  -p will clear the autoresume
+	# flags as well as your pkgcache and kerncache
+	"autoresume",
+
+	# Enables the bindist USE flag, please see package specific definition,
+	# however, it is suggested to enable this if redistributing builds.
+	# This optional USE flag is normally cleaned from the make.conf file on
+	# completion of the stage.  For a non-cleaned version, use
+	# sticky-config also (see below)
+	"bindist",
+
+	# Enable FEATURES=ccache
+	# "ccache",
+
+	# Enable FEATURES=distcc. You have to set distcc_hosts in your spec
+	# file.
+	# "distcc",
+
+	# Enable FEATURES=icecream
+	# "icecream",
+
+	# Prevents the removal of the working chroot path and any autoresume
+	# files or points.
+	# "keepwork",
+
+	# keeps a tbz2 of your built kernel and modules (useful if your
+	# build stops in livecd-stage2)
+	"kerncache",
+
+	# Build and use binary packages
+	"pkgcache",
+
+	# Use the build output of a previous target if it exists rather than
+	# the tarball
+	"seedcache",
+
+	# enables the code that will keep any internal 'catalyst_use' flags
+	# added to the USE= for building the stage.  These are usually added
+	# for legal or specific needs in building the the early stage.  Mostly
+	# it is the 'bindist' USE flag option that is used for legal reasons,
+	# please see its specific definition.  It will also keep any
+	# /etc/portage/package.* files or directories.
+	# "sticky-config",
+]
 
 # source_matching specifies how catalyst will match non-specific file names
 # if the filename is not found as an exact match.
@@ -60,15 +76,15 @@ options="autoresume bindist kerncache pkgcache seedcache"
 #   "loose"  meaning it will search for an existing filename with an added
 #            extension from an ordered list of extensions determined from the
 #            decompressor_search_order specification in the spec file or (default)
-source_matching="strict"
+source_matching = "strict"
 
 # port_logdir is where all build logs will be kept. This dir will be automatically cleaned
 # of all logs over 30 days old. If left undefined the logs will remain in the build directory
 # as usual and get cleaned every time a stage build is restarted.
-# port_logdir="/var/tmp/catalyst/tmp"
+# port_logdir = "/var/tmp/catalyst/tmp"
 
 # var_tmpfs_portage will mount a tmpfs for /var/tmp/portage so building takes place in RAM
 # this feature requires a pretty large tmpfs ({open,libre}office needs ~8GB to build)
 # WARNING: If you use too much RAM everything will fail horribly and it is not our fault.
 # set size of /var/tmp/portage tmpfs in gigabytes
-# var_tmpfs_portage=16
+# var_tmpfs_portage = 16

[gentoo-commits] proj/catalyst:master commit in: etc/

[Matt Turner]

commit:     7ebe33811989b72e1e48481641b6db56f9abbfb2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 21:57:18 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 18:12:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7ebe3381

etc: Add some possible settings to catalystrc

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 etc/catalystrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/catalystrc b/etc/catalystrc
index e7904128..176f106a 100755
--- a/etc/catalystrc
+++ b/etc/catalystrc
@@ -1,2 +1,4 @@
 #!/bin/bash
-# This is an example catalystrc. As such, it doesn't actually *do* anything.
+
+# export BINPKG_COMPRESS="gzip"
+# export BINPKG_COMPRESS_FLAGS="-7"

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: etc/

[Matt Turner]

commit:     7ebe33811989b72e1e48481641b6db56f9abbfb2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 21:57:18 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 18:12:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7ebe3381

etc: Add some possible settings to catalystrc

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 etc/catalystrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/catalystrc b/etc/catalystrc
index e7904128..176f106a 100755
--- a/etc/catalystrc
+++ b/etc/catalystrc
@@ -1,2 +1,4 @@
 #!/bin/bash
-# This is an example catalystrc. As such, it doesn't actually *do* anything.
+
+# export BINPKG_COMPRESS="gzip"
+# export BINPKG_COMPRESS_FLAGS="-7"