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

2023-11-10 Thread Ben Kohler 
commit: daf74e194f87e29af1807990abe37dab701e4afd
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Nov 10 19:59:15 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Nov 10 20:08:05 2023 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=daf74e19

catalyst.conf: change dangerous port_logdir example

If this existing example was uncommented, it would trigger a cleanup of
any files older than 7d in the currently running stage build dir,
causing catastrophic failure.

Signed-off-by: Ben Kohler  gentoo.org>

 etc/catalyst.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 8745d0b5..867c7153 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -66,9 +66,9 @@ options = [
 ]
 
 # 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
+# of ALL files over 7 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/logs"
 
 # 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)

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

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

etc: Add some possible settings to catalystrc

Signed-off-by: Matt Turner  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:master commit in: etc/, catalyst/, doc/, catalyst/base/

2020-04-30 Thread Matt Turner 
commit: 2aaf13883fcfb63feb6e90e1670012329b92afdb
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Apr 22 02:02:59 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Apr 30 23:04:34 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2aaf1388

catalyst: Rename 'portdir' -> 'target_portdir'

With sqfs snapshots, there's now no dependence on the build system's
portdir.

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py |  2 +-
 catalyst/defaults.py   |  2 +-
 doc/catalyst-config.5.txt  | 12 +---
 etc/catalyst.conf  |  3 ---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 41da97b3..e1477bb4 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -803,7 +803,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 make_profile = Path(self.settings['chroot_path'] + 
self.settings['port_conf'],
 'make.profile')
 make_profile.unlink()
-make_profile.symlink_to(Path('../..' + self.settings['portdir'],
+make_profile.symlink_to(Path('../..' + self.settings['target_portdir'],
  'profiles',
  self.settings['target_profile']),
 target_is_directory=True)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 33f06d34..9878b426 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -63,7 +63,6 @@ confdefaults = {
 "make_conf": "%(port_conf)s/make.conf",
 "options": set(),
 "pkgdir": "/var/cache/binpkgs",
-"portdir": "/var/db/repos/gentoo",
 "port_tmpdir": "/var/tmp/portage",
 "PythonDir": "./catalyst",
 "repo_basedir": "/var/db/repos",
@@ -75,6 +74,7 @@ confdefaults = {
 "storedir": "/var/tmp/catalyst",
 "target_distdir": "/var/cache/distfiles",
 "target_pkgdir": "/var/cache/binpkgs",
+"target_portdir": "/var/db/repos/gentoo",
 }
 
 DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf'

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 925934ad..c1ebe9dd 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -28,9 +28,6 @@ and empty lines are interpreted as comments.  For example:
 digests="auto"
 envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache"
-
-# source repo settings
-portdir="/var/db/repos/gentoo"
 -
 
 The possible keywords and their meanings are as follows:
@@ -107,10 +104,6 @@ Repository settings
 Defines the location of your local source file repository.
 Defaults to the host's DISTDIR.
 
-*portdir*::
-Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should 
work for most
-default installations.
-
 *repos*::
 The directory in which git repositories exist for use by the snapshot target.
 Defaults to `${storedir}/repos`.
@@ -135,6 +128,11 @@ This is the target packages directory for storing binpkgs 
in the stage being
 built.  This location is stored in the make.conf of the stage being built.
 The default location is `/var/cache/binpkgs`
 
+*target_portdir*::
+Defines the location of main repository in the target stages.  This
+location is stored in make.conf of the stage being built.
+The default location is `/var/db/repos/gentoo`
+
 Other settings
 ~~
 

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 6a499038..5aa2b3fb 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -52,9 +52,6 @@ envscript="/etc/catalyst/catalystrc"
 # (These options can be used together)
 options="autoresume bindist kerncache pkgcache seedcache"
 
-# Source portdir specifies the source portage tree used by the snapshot target.
-portdir="/var/db/repos/gentoo"
-
 # source_matching specifies how catalyst will match non-specific file names
 # if the filename is not found as an exact match.
 # ie: a filename without the extension specified.  "/path/to/foo"

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

2020-04-30 Thread Matt Turner 
commit: 4e908d9934f988c01782b7d4fa8cd9bfa8853efa
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Apr  9 03:37:16 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Apr 23 18:20:35 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4e908d99

catalyst: Remove snapcache support

Among the problems with snapcache were broken locking, and still needing
to pack and unpack snapshot tarballs. In a few commits, I'm going to
replace it with something significantly better.

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py | 103 +
 catalyst/defaults.py   |   3 --
 doc/catalyst-config.5.txt  |  10 +
 etc/catalyst.conf  |   5 +--
 4 files changed, 24 insertions(+), 97 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1c0d98c6..275c07eb 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -152,7 +152,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
 self.set_snapshot_path()
 self.set_root_path()
 self.set_source_path()
-self.set_snapcache_path()
 self.set_chroot_path()
 self.set_autoresume_path()
 self.set_dest_path()
@@ -192,20 +191,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
 # Setup our mount points.
 self.mount = MOUNT_DEFAULTS.copy()
 
-self.mount['portdir']['source'] = self.settings['portdir']
-self.mount['portdir']['target'] = 
normpath(self.settings["repo_basedir"]
-   + "/" +
-   self.settings["repo_name"])
-self.mount['distdir']['source'] = self.settings['distdir']
-self.mount["distdir"]['target'] = self.settings["target_distdir"]
+# Always unpack snapshot tarball
+self.mount['portdir']['enable'] = False
 
-if "snapcache" not in self.settings["options"]:
-self.mount['portdir']['enable'] = False
-else:
-self.mount['portdir']['source'] = normpath("/".join([
-self.settings['snapshot_cache_path'],
-self.settings['repo_name']
-]))
+self.mount['distdir']['source'] = self.settings['distdir']
+self.mount["distdir"]['target'] = self.settings['target_distdir']
 
 # Configure any user specified options (either in catalyst.conf or on
 # the command line).
@@ -461,19 +451,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
 self.settings["snapshot_path_hash"] = \
 self.generate_hash(self.settings["snapshot_path"], "sha1")
 
-def set_snapcache_path(self):
-self.settings["snapshot_cache_path"] = \
-normpath(pjoin(self.settings["snapshot_cache"],
-   self.settings["snapshot"]))
-if "snapcache" in self.settings["options"]:
-self.settings["snapshot_cache_path"] = \
-normpath(pjoin(self.settings["snapshot_cache"],
-   self.settings["snapshot"]))
-self.snapcache_lock = \
-LockDir(self.settings["snapshot_cache_path"])
-log.info('Setting snapshot cache to %s',
- self.settings['snapshot_cache_path'])
-
 def set_chroot_path(self):
 """
 NOTE: the trailing slash has been removed
@@ -841,7 +818,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
 unpack_info = self.decompressor.create_infodict(
 source=self.settings["snapshot_path"],
-destination=self.settings["snapshot_cache_path"],
 arch=self.settings["compressor_arch"],
 other_options=self.settings["compressor_options"],
 )
@@ -850,41 +826,22 @@ class StageBase(TargetBase, ClearBase, GenBase):
   self.settings["repo_basedir"] + "/" + 
self.settings["repo_name"])
 log.info('%s', self.settings['chroot_path'])
 log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
-if "snapcache" in self.settings["options"]:
-snapshot_cache_hash_path = pjoin(
-self.settings['snapshot_cache_path'], 'catalyst-hash')
-snapshot_cache_hash = fileutils.readfile(
-snapshot_cache_hash_path, True)
-unpack_info['mode'] = self.decompressor.determine_mode(
-unpack_info['source'])
-
-cleanup_msg = "Cleaning up invalid snapshot cache at \n\t" + \
-self.settings["snapshot_cache_path"] + \
-" (this can take a long time)..."
-
-if self.settings["snapshot_path_hash"] == snapshot_cache_hash:
-log.info(
-'Valid snapshot cache, skipping unpack of portage tree...')
-unpack = False
-else:
-cleanup_msg = \
-'Cleaning up

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

2020-04-30 Thread Matt Turner 
commit: a3dcb792bb78ec003c1082773ce0b5108de1b512
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Apr 22 02:02:59 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Apr 30 22:56:12 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a3dcb792

catalyst: Rename 'portdir' -> 'target_portdir'

With sqfs snapshots, there's now no dependence on the build system's
portdir.

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py |  2 +-
 catalyst/defaults.py   |  2 +-
 doc/catalyst-config.5.txt  | 12 +---
 etc/catalyst.conf  |  3 ---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 41da97b3..e1477bb4 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -803,7 +803,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 make_profile = Path(self.settings['chroot_path'] + 
self.settings['port_conf'],
 'make.profile')
 make_profile.unlink()
-make_profile.symlink_to(Path('../..' + self.settings['portdir'],
+make_profile.symlink_to(Path('../..' + self.settings['target_portdir'],
  'profiles',
  self.settings['target_profile']),
 target_is_directory=True)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 33f06d34..9878b426 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -63,7 +63,6 @@ confdefaults = {
 "make_conf": "%(port_conf)s/make.conf",
 "options": set(),
 "pkgdir": "/var/cache/binpkgs",
-"portdir": "/var/db/repos/gentoo",
 "port_tmpdir": "/var/tmp/portage",
 "PythonDir": "./catalyst",
 "repo_basedir": "/var/db/repos",
@@ -75,6 +74,7 @@ confdefaults = {
 "storedir": "/var/tmp/catalyst",
 "target_distdir": "/var/cache/distfiles",
 "target_pkgdir": "/var/cache/binpkgs",
+"target_portdir": "/var/db/repos/gentoo",
 }
 
 DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf'

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 925934ad..c1ebe9dd 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -28,9 +28,6 @@ and empty lines are interpreted as comments.  For example:
 digests="auto"
 envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache"
-
-# source repo settings
-portdir="/var/db/repos/gentoo"
 -
 
 The possible keywords and their meanings are as follows:
@@ -107,10 +104,6 @@ Repository settings
 Defines the location of your local source file repository.
 Defaults to the host's DISTDIR.
 
-*portdir*::
-Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should 
work for most
-default installations.
-
 *repos*::
 The directory in which git repositories exist for use by the snapshot target.
 Defaults to `${storedir}/repos`.
@@ -135,6 +128,11 @@ This is the target packages directory for storing binpkgs 
in the stage being
 built.  This location is stored in the make.conf of the stage being built.
 The default location is `/var/cache/binpkgs`
 
+*target_portdir*::
+Defines the location of main repository in the target stages.  This
+location is stored in make.conf of the stage being built.
+The default location is `/var/db/repos/gentoo`
+
 Other settings
 ~~
 

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 6a499038..5aa2b3fb 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -52,9 +52,6 @@ envscript="/etc/catalyst/catalystrc"
 # (These options can be used together)
 options="autoresume bindist kerncache pkgcache seedcache"
 
-# Source portdir specifies the source portage tree used by the snapshot target.
-portdir="/var/db/repos/gentoo"
-
 # source_matching specifies how catalyst will match non-specific file names
 # if the filename is not found as an exact match.
 # ie: a filename without the extension specified.  "/path/to/foo"

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

2020-04-21 Thread Matt Turner 
commit: 6493f3bc534f97468c514a12035b10e3107c4ecf
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Apr 22 00:49:39 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Apr 22 02:09:59 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6493f3bc

catalyst: Remove some defaults from configuration file

Leave the machinery in place, but remove the default settings from the
configuration file, since basically no one is going to need to change
these and in practice they just cover up mistakes in defaults.py.

Signed-off-by: Matt Turner  gentoo.org>

 doc/catalyst-config.5.txt | 14 +-
 etc/catalyst.conf | 27 ---
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index df3f25f9..a0cd0490 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -30,19 +30,7 @@ envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache snapcache"
 
 # source repo settings
-distdir="/var/cache/distfiles"
 portdir="/var/db/repos/gentoo"
-
-# target repo info
-repo_basedir="/var/db/repos"
-repo_name="gentoo"
-target_distdir="/var/cache/distfiles"
-target_pkgdir="/var/cache/binpkgs"
-
-# other catalyst settings
-sharedir="/usr/share/catalyst"
-snapshot_cache="/var/tmp/catalyst/snapshot_cache"
-storedir="/var/tmp/catalyst"
 -
 
 The possible keywords and their meanings are as follows:
@@ -150,7 +138,7 @@ The default location is `/var/cache/distfiles`.
 *target_pkgdir*::
 This is the target packages directory for storing binpkgs in the stage being
 built.  This location is stored in the make.conf of the stage being built.
-The default location for this has typically been `/var/cache/binpkgs`
+The default location is `/var/cache/binpkgs`
 
 Other settings
 ~~

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 60a4dd93..6d530a39 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -58,33 +58,6 @@ options="autoresume bindist kerncache pkgcache seedcache 
snapcache"
 # Source portdir specifies the source portage tree used by the snapshot target.
 portdir="/var/db/repos/gentoo"
 
-# Target portdir setting.  It needs to be in 2 parts.
-# They will be used separately, then added together where needed.
-# eg:
-# repo_basedir="/var/db/repos"
-# repo_name="gentoo"
-#
-repo_basedir="/var/db/repos"
-repo_name="gentoo"
-target_distdir="/var/cache/distfiles"
-target_pkgdir="/var/cache/binpkgs"
-
-# sharedir specifies where all of the catalyst runtime executables
-# and other shared lib objects are.
-# Most users do not need to change this.
-sharedir="/usr/share/catalyst"
-
-# shdir specifies where all of the catalyst runtime executables are.
-shdir="%(sharedir)s/targets"
-
-# snapshot_cache specifies where the snapshots will be cached to if snapcache 
is
-# enabled in the options.
-snapshot_cache="/var/tmp/catalyst/snapshot_cache"
-
-# storedir specifies where catalyst will store everything that it builds, and
-# also where it will put its temporary files and caches.
-storedir="/var/tmp/catalyst"
-
 # source_matching specifies how catalyst will match non-specific file names
 # if the filename is not found as an exact match.
 # ie: a filename without the extension specified.  "/path/to/foo"

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

2019-03-28 Thread Ben Kohler 
commit: e19962428d55317cd5ebd275de09868add6de54f
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Mar 29 00:20:05 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Mar 29 00:20:05 2019 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e1996242

Fix minor doc typos

Thanks to simonvanderveldt.

Closes: https://github.com/gentoo/catalyst/pull/3/

Signed-off-by: Ben Kohler  gentoo.org>

 etc/catalyst.conf| 2 +-
 examples/livecd-stage2_template.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index c22cd439..7d7f7aba 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -74,7 +74,7 @@ hash_function="crc32"
 #  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
+#  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.*

diff --git a/examples/livecd-stage2_template.spec 
b/examples/livecd-stage2_template.spec
index 419f4806..8aa454c9 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -358,7 +358,7 @@ livecd/unmerge:
 livecd/empty:
 
 # This option tells catalyst to clean specific files from the filesystem and is
-# very usefu in cleaning up stray files in /etc left over after livecd/unmerge.
+# very useful in cleaning up stray files in /etc left over after 
livecd/unmerge.
 # example:
 # livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* 
/etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* 
/etc/portage/make.conf /etc/man.conf /etc/*.old /root/.viminfo 
/usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix 
/usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs 
/lib/security/pam_access.so /lib/security/pam_chroot.so 
/lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so 
/lib/security/pam_mail.so /lib/security/pam_motd.so 
/lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so 
/lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so 
/usr/share/consolefonts/1* /usr/share/consolefonts/7* 
/usr/share/consolefonts/8* /usr/share/consolefonts/9* 
/usr/share/consolefonts/A* /usr/share/consolefonts/C* 
/usr/share/consolefonts/E* /usr/share/consolefonts/G* 
/usr/share/consolefonts/L* /usr/share/consolefonts/M* 
/usr/share/consolefonts/R* /usr/share/consolefonts/a* 
/usr/share/consolefonts/c* /u
 sr/share/consolefonts/dr* /usr/share/consolefonts/g* 
/usr/share/consolefonts/i* /usr/share/consolefonts/k* 
/usr/share/consolefonts/l* /usr/share/consolefonts/r* 
/usr/share/consolefonts/s* /usr/share/consolefonts/t* 
/usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* 
/etc/splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* 
/etc/splash/livecd-2006.1/8* /etc/splash/livecd-2006.1/images/silent-16* 
/etc/splash/livecd-2006.1/images/silent-12* 
/etc/splash/livecd-2006.1/images/silent-6* 
/etc/splash/livecd-2006.1/images/silent-8* 
/etc/splash/livecd-2006.1/images/verbose-16* 
/etc/splash/livecd-2006.1/images/verbose-12* 
/etc/splash/livecd-2006.1/images/verbose-6* 
/etc/splash/livecd-2006.1/images/verbose-8* /etc/portage/make.conf.example 
/etc/make.globals /etc/resolv.conf
 livecd/rm:

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

2016-02-01 Thread Brian Dolbec 
commit: 3b726cc3d2e48f30cec47856b5616cd92ae3e7b6
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Feb  2 06:10:09 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue Feb  2 06:10:09 2016 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3b726cc3

etc/catalyst.conf: Set default digests to sha512 whirlpool

Setting digests="auto" by default can cause up to 27 different hashes, not to 
mention
the amount of time it could take.

 etc/catalyst.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 734e428..2e61ea4 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -12,7 +12,7 @@
 # haval256, md2, md4, md5, ripemd128, ripemd160, ripemd256, ripemd320, sha1,
 # sha224, sha256, sha384, sha512, snefru128, snefru256, tiger, tiger128,
 # tiger160, whirlpool
-digests="auto"
+digests="sha512 whirlpool"
 
 # Creates a .CONTENTS file listing the contents of the file. Pick from any of
 # the supported options below:

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

2015-12-28 Thread Brian Dolbec 
commit: 051f684fe3e6150bf26a445b9c18092742b6a240
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Dec 29 01:43:53 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue Dec 29 01:43:53 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=051f684f

Create a file extension search order system for source paths

Adds a new source_matching setting to the config, defaults to "strict".
Allows for the possibility of multiple compression types to be present in teh 
same directory
and allow for a prefered matching system.

 catalyst/base/stagebase.py | 35 +++
 catalyst/defaults.py   |  1 +
 catalyst/support.py| 13 +++--
 etc/catalyst.conf  | 12 
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c800c34..8891b3f 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -143,6 +143,19 @@ class StageBase(TargetBase, ClearBase, GenBase):
# This must be set first as other set_ options depend on this
self.set_spec_prefix()
 
+   # Initialize our (de)compressor's)
+   self.decompressor = 
CompressMap(self.settings["decompress_definitions"],
+   env=self.env,
+   search_order=self.settings["decompressor_search_order"])
+   self.accepted_extensions = 
self.decompressor.search_order_extensions(
+   self.settings["decompressor_search_order"])
+   log.notice("Source file specification matching setting is: %s",
+   self.settings["source_matching"])
+   log.notice("Accepted source file extensions search order: %s",
+   self.accepted_extensions)
+   # save resources, it is not always needed
+   self.compressor = None
+
# Define all of our core variables
self.set_target_profile()
self.set_target_subpath()
@@ -254,14 +267,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.env["PORT_LOGDIR"] = self.settings["port_logdir"]
self.env["PORT_LOGDIR_CLEAN"] = PORT_LOGDIR_CLEAN
 
-   # Initialize our (de)compressor's)
-   self.decompressor = 
CompressMap(self.settings["decompress_definitions"],
-   env=self.env,
-   search_order=self.settings["decompressor_search_order"])
-
-   # save resources, it is not always needed
-   self.compressor = None
-
def override_cbuild(self):
if "CBUILD" in self.makeconf:
self.settings["CBUILD"]=self.makeconf["CBUILD"]
@@ -416,7 +421,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["source_subpath"])
self.settings["source_path"] = file_check(
normpath(self.settings["storedir"] + "/builds/" 
+
-   self.settings["source_subpath"])
+   self.settings["source_subpath"]),
+   self.accepted_extensions,
+   self.settings["source_matching"] in ["strict"]
)
log.debug('Source path returned from file_check is: %s',
self.settings["source_path"])
@@ -441,9 +448,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
"/root/*", self.settings["portdir"]]
 
def set_snapshot_path(self):
-   self.settings["snapshot_path"]= 
file_check(normpath(self.settings["storedir"]+\
-   "/snapshots/" + self.settings["snapshot_name"] +
-   self.settings["snapshot"]))
+   self.settings["snapshot_path"]= file_check(
+   normpath(self.settings["storedir"]+\
+   "/snapshots/" + self.settings["snapshot_name"] +
+   self.settings["snapshot"]),
+   self.accepted_extensions,
+   self.settings["source_matching"] is "strict"
+   )
log.info('SNAPSHOT_PATH set to: %s', 
self.settings['snapshot_path'])
self.settings["snapshot_path_hash"] = \
self.settings["hash_map"].generate_hash(

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index c5162d6..a0e3ea8 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -43,6 +43,7 @@ confdefaults={
"shdir": "/usr/share/catalyst/targets/",
"snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
"snapshot_name": "portage-",
+   "source_matching": "strict",
"storedir": "/var/tmp/catalyst",
}
 

diff

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

2015-10-05 Thread Anthony G. Basile 
commit: 1221e871dc2ac3a67b5a6a59a35ad61b5543ca4f
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Oct  5 18:10:21 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Oct  5 23:36:47 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1221e871

catalyst.conf: minor tweaks to comments

Signed-off-by: Anthony G. Basile  gentoo.org>

 etc/catalyst.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index aa5d815..a2abb4a 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -1,6 +1,6 @@
 # /etc/catalyst/catalyst.conf
 
-# Simple desriptions of catalyst settings. Please refer to the online
+# Simple descriptions of catalyst settings. Please refer to the online
 # documentation for more information.
 
 # Creates a .DIGESTS file containing the hash output from any of the supported
@@ -53,7 +53,7 @@ hash_function="crc32"
 #  however, it is suggested to enable this if redistributing builds.
 # ccache = enables build time ccache support
 # distcc = enable distcc support for building. You have to set distcc_hosts in
-#  your spec file.
+#  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.
@@ -62,7 +62,7 @@ hash_function="crc32"
 # pkgcache = keeps a tbz2 of every built package (useful if your build stops
 #  prematurely)
 # preserve_libs = enables portage to preserve used libs when unmerging packages
-#   (used on installcd-stage2 and stage4 targets)
+#  (used on installcd-stage2 and stage4 targets)
 # seedcache = use the build output of a previous target if it exists to speed 
up
 #  the copy
 # snapcache = cache the snapshot so that it can be bind-mounted into the 
chroot.

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

2015-08-29 Thread Jorge Manuel B. S. Vicetto 
commit: 27a8732039fdd2102cd216f421f66c58c905e693
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo 
DOT org
AuthorDate: Sun Aug 30 01:28:03 2015 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sun Aug 30 01:28:03 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=27a87320

Update sharedir location from /usr/lib/catalyst to /usr/share/catalyst.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT 
gentoo.org

 README   | 2 +-
 catalyst/defaults.py | 4 ++--
 doc/catalyst-config.5.txt| 4 ++--
 doc/catalyst-spec.5.txt  | 4 ++--
 etc/catalyst.conf| 2 +-
 examples/livecd-stage2_template.spec | 2 +-
 examples/netboot_template.spec   | 2 +-
 setup.py | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README b/README
index 0674e07..0a0373c 100644
--- a/README
+++ b/README
@@ -54,7 +54,7 @@ Example catalyst.conf:
 
 distdir=/usr/portage/distfiles
 options=pkgcache kerncache
-sharedir=/usr/lib/catalyst
+sharedir=/usr/share/catalyst
 
 There are many more options that can be set, but those defaults are good
 for out of the box operation. For more documentation on what you can do

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 2f4f429..5cb5e3f 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -33,8 +33,8 @@ confdefaults={
port_tmpdir: /var/tmp/portage,
PythonDir: ./catalyst,
repo_name: portage,
-   sharedir: /usr/lib/catalyst,
-   shdir: /usr/lib/catalyst/targets/,
+   sharedir: /usr/share/catalyst,
+   shdir: /usr/share/catalyst/targets/,
snapshot_cache: /var/tmp/catalyst/snapshot_cache,
snapshot_name: portage-,
storedir: /var/tmp/catalyst,

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 63a015f..61f3d93 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -30,7 +30,7 @@ distdir=/usr/portage/distfiles
 envscript=/etc/catalyst/catalystrc
 options=autoresume bindist kerncache pkgcache seedcache snapcache
 portdir=/usr/portage
-sharedir=/usr/lib/catalyst
+sharedir=/usr/share/catalyst
 snapshot_cache=/var/tmp/catalyst/snapshot_cache
 storedir=/var/tmp/catalyst
 -
@@ -145,7 +145,7 @@ Portage tree location.  `/usr/portage/` should work for 
most default
 installations.
 
 *sharedir*::
-Catalyst runtime script location.  `/usr/lib/catalyst` should work for
+Catalyst runtime script location.  `/usr/share/catalyst` should work for
 most default installations.  If you are running catalyst from a Git
 checkout, you should change this to point to your checkout directory.
 

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index b3e2bf5..cba3166 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -210,7 +210,7 @@ The cdtar is essentially the bootloader for the CD.  It 
also holds the
 main configuration for the bootloader.  On x86/amd64, it also can
 include a small memory testing application, called memtest86+
 (example:
-`/usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2`).
+`/usr/share/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2`).
 
 Kernel and boot issues
 ~~
@@ -312,7 +312,7 @@ supported by the `netboot` and `netboot2` targets.
 *netboot/base_tarball*::
 This is the full path and filename to the tarball to use as the base
 for the netboot image (example:
-`/usr/lib/catalyst/netboot/netboot-base.tar.bz2`).
+`/usr/share/catalyst/netboot/netboot-base.tar.bz2`).
 
 Runlevels
 ~

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 01708e7..7f56671 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -78,7 +78,7 @@ portdir=/usr/portage
 # sharedir specifies where all of the catalyst runtime executables
 # and other shared lib objects are.
 # Most users do not need to change this.
-sharedir=/usr/lib/catalyst
+sharedir=/usr/share/catalyst
 
 # shdir specifies where all of the catalyst runtime executables are.
 shdir=%(sharedir)s/targets

diff --git a/examples/livecd-stage2_template.spec 
b/examples/livecd-stage2_template.spec
index ca1ca82..c2c6bf3 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -103,7 +103,7 @@ livecd/fsops:
 # configuration for the bootloader.  On x86/amd64, it also can include a small
 # memory testing application, called memtest86+.
 # example:
-# livecd/cdtar: 
/usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2
+# livecd/cdtar: 
/usr/share/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2
 livecd/cdtar:
 
 # This is the full path and filename to the ISO image that the livecd-stage2

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 921ddf4..d10b645 100644
---

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

2014-04-02 Thread Brian Dolbec 
commit: b49a3aef208727aa8085e27a55e19400b71e3541
Author: Brian Dolbec dolsen AT gentoo DOT org
AuthorDate: Fri Jan  3 18:28:12 2014 +
Commit: Brian Dolbec brian.dolbec AT gmail DOT com
CommitDate: Wed Apr  2 20:04:23 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b49a3aef

files/catalyst.conf: Whitespace cleanup

---
 etc/catalyst.conf | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 57606ca..2d377b2 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -15,12 +15,12 @@ digests=md5 sha1 sha512 whirlpool
 # Creates a .CONTENTS file listing the contents of the file. Pick from any of
 # the supported options below:
 # auto - strongly recommended
-# tar-tv   - does 'tar tvf FILE'
-# tar-tvz  - does 'tar tvzf FILE'
-# tar-tvy  - does 'tar tvyf FILE'
-# isoinfo-l- does 'isoinfo -l -i FILE'
-# isoinfo-f- does 'isoinfo -f -i FILE'
-# 'isoinfo-f' is the only option not chosen by the automatic algorithm.
+# tar_tv   - does 'tar tvf FILE'
+# tar_tvz  - does 'tar tvzf FILE'
+# tar_tvy  - does 'tar tvyf FILE'
+# isoinfo_l- does 'isoinfo -l -i FILE'
+# isoinfo_f- does 'isoinfo -f -i FILE'
+# 'isoinfo_f' is the only option not chosen by the automatic algorithm.
 # If this variable is empty, no .CONTENTS will be generated at all.
 contents=auto