aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2017-12-04 09:16:01 -0800
committerBrian Dolbec <dolsen@gentoo.org>2017-12-04 09:57:25 -0800
commitf7b53cd2f78c5b3dfb4244d57fc0357733b549fd (patch)
tree3567e54c61858664ce2a5449fb30d639078c4777
parentreleases/weekly: drop net-dialup/globespan-adsl (diff)
downloadreleng-f7b53cd2f78c5b3dfb4244d57fc0357733b549fd.tar.gz
releng-f7b53cd2f78c5b3dfb4244d57fc0357733b549fd.tar.bz2
releng-f7b53cd2f78c5b3dfb4244d57fc0357733b549fd.zip
Update configs for catalyst-3
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
-rw-r--r--config/amd64-auto.conf10
-rw-r--r--config/snapshot-auto.conf8
-rw-r--r--config/snapshot.conf8
-rw-r--r--config/x86-auto.conf10
4 files changed, 30 insertions, 6 deletions
diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf
index 6120a6ab..beb4fe67 100644
--- a/config/amd64-auto.conf
+++ b/config/amd64-auto.conf
@@ -1,10 +1,16 @@
-distdir="/release/tmp/distfiles/"
+repo_basedir="/usr/portage"
+repo_name="gentoo"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
+distdir="/release/tmp/distfiles"
portdir="/release/trees/portage-auto"
options="autoresume bindist pkgcache preserve_libs seedcache snapcache"
-sharedir="/usr/lib64/catalyst/"
+sharedir="/usr/share/catalyst"
+shdir="/usr/share/catalyst/targets"
storedir="/release/buildroot/amd64-dev"
snapshot_cache="/release/tmp/snapshots"
envscript="/etc/catalyst/local/host.env"
hash_function="crc32"
digests="sha512 whirlpool"
contents="auto"
+source_matching="loose"
diff --git a/config/snapshot-auto.conf b/config/snapshot-auto.conf
index 7b39cb8b..831d4335 100644
--- a/config/snapshot-auto.conf
+++ b/config/snapshot-auto.conf
@@ -1,7 +1,13 @@
+repo_basedir="/usr/portage"
+repo_name="gentoo"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
distdir="/usr/portage/distfiles"
portdir="/release/trees/portage-auto"
-sharedir="/usr/lib/catalyst"
+sharedir="/usr/share/catalyst"
+shdir="/usr/share/catalyst/targets"
storedir="/release"
hash_function="crc32"
digests="md5 sha1"
contents="auto"
+source_matching="loose"
diff --git a/config/snapshot.conf b/config/snapshot.conf
index 9213476f..e4fe1b0a 100644
--- a/config/snapshot.conf
+++ b/config/snapshot.conf
@@ -1,7 +1,13 @@
+repo_basedir="/usr/portage"
+repo_name="gentoo"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
distdir="/usr/portage/distfiles"
portdir="/release/trees/portage"
-sharedir="/usr/lib/catalyst"
+sharedir="/usr/share/catalyst"
+shdir="/usr/share/catalyst/targets"
storedir="/release"
hash_function="crc32"
digests="md5 sha1"
contents="auto"
+source_matching="loose"
diff --git a/config/x86-auto.conf b/config/x86-auto.conf
index f4e934ff..3d668531 100644
--- a/config/x86-auto.conf
+++ b/config/x86-auto.conf
@@ -1,10 +1,16 @@
-distdir="/release/tmp/distfiles/"
+repo_basedir="/usr/portage"
+repo_name="gentoo"
+target_distdir="/usr/portage/distfiles"
+target_pkgdir="/usr/portage/packages"
+distdir="/release/tmp/distfiles"
portdir="/release/trees/portage-auto"
options="autoresume bindist pkgcache preserve_libs seedcache snapcache"
-sharedir="/usr/lib64/catalyst/"
+sharedir="/usr/share/catalyst"
+shdir="/usr/share/catalyst/targets"
storedir="/release/buildroot/x86-dev"
snapshot_cache="/release/tmp/snapshots"
envscript="/etc/catalyst/local/host.env"
hash_function="crc32"
digests="sha512 whirlpool"
contents="auto"
+source_matching="loose"