Unify all make.conf settings and writing

This excludes stage1 builds which needs to modify the seed stage's make.conf for
initial stage building.

1 files changed, 9 insertions, 0 deletions

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index b4db063c..c22cd439 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -53,6 +53,9 @@ hash_function="crc32"
 #	( 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.
@@ -70,6 +73,12 @@ hash_function="crc32"
 # snapcache = cache the snapshot so that it can be bind-mounted into the chroot.
 #	WARNING: moving parts of the portage tree from within fsscript *will* break
 #	your cache. The cache is unlinked before any empty or rm processing, though.
+# sticky-config = enables the code that will keep any internal 'catalyst_use' flags
+#	added to the USE= for building the stage.  These ae 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 snapcache"