| 1 |
commit: f7b53cd2f78c5b3dfb4244d57fc0357733b549fd |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 4 17:16:01 2017 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 4 17:57:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f7b53cd2 |
| 7 |
|
| 8 |
Update configs for catalyst-3 |
| 9 |
|
| 10 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 11 |
|
| 12 |
config/amd64-auto.conf | 10 ++++++++-- |
| 13 |
config/snapshot-auto.conf | 8 +++++++- |
| 14 |
config/snapshot.conf | 8 +++++++- |
| 15 |
config/x86-auto.conf | 10 ++++++++-- |
| 16 |
4 files changed, 30 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf |
| 19 |
index 6120a6ab..beb4fe67 100644 |
| 20 |
--- a/config/amd64-auto.conf |
| 21 |
+++ b/config/amd64-auto.conf |
| 22 |
@@ -1,10 +1,16 @@ |
| 23 |
-distdir="/release/tmp/distfiles/" |
| 24 |
+repo_basedir="/usr/portage" |
| 25 |
+repo_name="gentoo" |
| 26 |
+target_distdir="/usr/portage/distfiles" |
| 27 |
+target_pkgdir="/usr/portage/packages" |
| 28 |
+distdir="/release/tmp/distfiles" |
| 29 |
portdir="/release/trees/portage-auto" |
| 30 |
options="autoresume bindist pkgcache preserve_libs seedcache snapcache" |
| 31 |
-sharedir="/usr/lib64/catalyst/" |
| 32 |
+sharedir="/usr/share/catalyst" |
| 33 |
+shdir="/usr/share/catalyst/targets" |
| 34 |
storedir="/release/buildroot/amd64-dev" |
| 35 |
snapshot_cache="/release/tmp/snapshots" |
| 36 |
envscript="/etc/catalyst/local/host.env" |
| 37 |
hash_function="crc32" |
| 38 |
digests="sha512 whirlpool" |
| 39 |
contents="auto" |
| 40 |
+source_matching="loose" |
| 41 |
|
| 42 |
diff --git a/config/snapshot-auto.conf b/config/snapshot-auto.conf |
| 43 |
index 7b39cb8b..831d4335 100644 |
| 44 |
--- a/config/snapshot-auto.conf |
| 45 |
+++ b/config/snapshot-auto.conf |
| 46 |
@@ -1,7 +1,13 @@ |
| 47 |
+repo_basedir="/usr/portage" |
| 48 |
+repo_name="gentoo" |
| 49 |
+target_distdir="/usr/portage/distfiles" |
| 50 |
+target_pkgdir="/usr/portage/packages" |
| 51 |
distdir="/usr/portage/distfiles" |
| 52 |
portdir="/release/trees/portage-auto" |
| 53 |
-sharedir="/usr/lib/catalyst" |
| 54 |
+sharedir="/usr/share/catalyst" |
| 55 |
+shdir="/usr/share/catalyst/targets" |
| 56 |
storedir="/release" |
| 57 |
hash_function="crc32" |
| 58 |
digests="md5 sha1" |
| 59 |
contents="auto" |
| 60 |
+source_matching="loose" |
| 61 |
|
| 62 |
diff --git a/config/snapshot.conf b/config/snapshot.conf |
| 63 |
index 9213476f..e4fe1b0a 100644 |
| 64 |
--- a/config/snapshot.conf |
| 65 |
+++ b/config/snapshot.conf |
| 66 |
@@ -1,7 +1,13 @@ |
| 67 |
+repo_basedir="/usr/portage" |
| 68 |
+repo_name="gentoo" |
| 69 |
+target_distdir="/usr/portage/distfiles" |
| 70 |
+target_pkgdir="/usr/portage/packages" |
| 71 |
distdir="/usr/portage/distfiles" |
| 72 |
portdir="/release/trees/portage" |
| 73 |
-sharedir="/usr/lib/catalyst" |
| 74 |
+sharedir="/usr/share/catalyst" |
| 75 |
+shdir="/usr/share/catalyst/targets" |
| 76 |
storedir="/release" |
| 77 |
hash_function="crc32" |
| 78 |
digests="md5 sha1" |
| 79 |
contents="auto" |
| 80 |
+source_matching="loose" |
| 81 |
|
| 82 |
diff --git a/config/x86-auto.conf b/config/x86-auto.conf |
| 83 |
index f4e934ff..3d668531 100644 |
| 84 |
--- a/config/x86-auto.conf |
| 85 |
+++ b/config/x86-auto.conf |
| 86 |
@@ -1,10 +1,16 @@ |
| 87 |
-distdir="/release/tmp/distfiles/" |
| 88 |
+repo_basedir="/usr/portage" |
| 89 |
+repo_name="gentoo" |
| 90 |
+target_distdir="/usr/portage/distfiles" |
| 91 |
+target_pkgdir="/usr/portage/packages" |
| 92 |
+distdir="/release/tmp/distfiles" |
| 93 |
portdir="/release/trees/portage-auto" |
| 94 |
options="autoresume bindist pkgcache preserve_libs seedcache snapcache" |
| 95 |
-sharedir="/usr/lib64/catalyst/" |
| 96 |
+sharedir="/usr/share/catalyst" |
| 97 |
+shdir="/usr/share/catalyst/targets" |
| 98 |
storedir="/release/buildroot/x86-dev" |
| 99 |
snapshot_cache="/release/tmp/snapshots" |
| 100 |
envscript="/etc/catalyst/local/host.env" |
| 101 |
hash_function="crc32" |
| 102 |
digests="sha512 whirlpool" |
| 103 |
contents="auto" |
| 104 |
+source_matching="loose" |
Archives