aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2012-10-13 13:18:29 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2012-10-13 13:18:29 +0000
commitc910463c2b8607f1a62bc60cc06faead4fff9734 (patch)
tree03f69c7163b23819cfea4a6dbb1dee649eb41a0d /config
parentAdd new build.env file with the default values used by releng boxes. (diff)
downloadreleng-c910463c2b8607f1a62bc60cc06faead4fff9734.tar.gz
releng-c910463c2b8607f1a62bc60cc06faead4fff9734.tar.bz2
releng-c910463c2b8607f1a62bc60cc06faead4fff9734.zip
Update config files. Add a config file for skimmer and allow the auto files to import a config file per host
by reading from /etc/catalyst/local.
Diffstat (limited to 'config')
-rw-r--r--config/amd64-auto.conf3
-rw-r--r--config/amd64-dev.env4
-rw-r--r--config/skimmer.env (renamed from config/x86-dev.env)1
-rw-r--r--config/x86-auto.conf3
4 files changed, 4 insertions, 7 deletions
diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf
index 93e968ea..5fc4f5c7 100644
--- a/config/amd64-auto.conf
+++ b/config/amd64-auto.conf
@@ -3,7 +3,8 @@ portdir="/release/trees/portage-auto"
options="autoresume kerncache pkgcache seedcache snapcache"
sharedir="/usr/lib64/catalyst/"
storedir="/release/buildroot/amd64-dev"
-envscript="/etc/catalyst/release/amd64-dev.env"
+snapshot_cache="/release/tmp/snapshots"
+envscript="/etc/catalyst/local/host.env"
hash_function="crc32"
digests="sha512 whirlpool"
contents="auto"
diff --git a/config/amd64-dev.env b/config/amd64-dev.env
deleted file mode 100644
index baceb002..00000000
--- a/config/amd64-dev.env
+++ /dev/null
@@ -1,4 +0,0 @@
-#export GENTOO_MIRRORS="http://gentoo.osuosl.org/"
-export GENTOO_MIRRORS="http://mirror.ovh.net/gentoo-distfiles/"
-export FEATURES="parallel-fetch"
-export MAKEOPTS="-j5 -l4"
diff --git a/config/x86-dev.env b/config/skimmer.env
index 36e89a78..d18400fe 100644
--- a/config/x86-dev.env
+++ b/config/skimmer.env
@@ -1,4 +1,3 @@
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/"
export GENTOO_MIRRORS="http://mirror.ovh.net/gentoo-distfiles/"
export FEATURES="parallel-fetch"
export MAKEOPTS="-j5 -l4"
diff --git a/config/x86-auto.conf b/config/x86-auto.conf
index 5067b658..3e37bb00 100644
--- a/config/x86-auto.conf
+++ b/config/x86-auto.conf
@@ -3,7 +3,8 @@ portdir="/release/trees/portage-auto"
options="autoresume kerncache pkgcache seedcache snapcache"
sharedir="/usr/lib64/catalyst/"
storedir="/release/buildroot/x86-dev"
-envscript="/etc/catalyst/release/x86-dev.env"
+snapshot_cache="/release/tmp/snapshots"
+envscript="/etc/catalyst/local/host.env"
hash_function="crc32"
digests="sha512 whirlpool"
contents="auto"