From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-513971-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 575DC138010
for <garchives@archives.gentoo.org>; Sat, 13 Oct 2012 13:19:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 495D921C00D;
Sat, 13 Oct 2012 13:19:34 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id C323E21C00D
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Oct 2012 13:19:33 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 317A733D84A
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Oct 2012 13:19:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id AFF1EE5436
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Oct 2012 13:19:30 +0000 (UTC)
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Message-ID: <1350134309.c910463c2b8607f1a62bc60cc06faead4fff9734.jmbsvicetto@gentoo>
Subject: [gentoo-commits] proj/releng:master commit in: config/
X-VCS-Repository: proj/releng
X-VCS-Files: config/amd64-auto.conf config/amd64-dev.env config/skimmer.env config/x86-auto.conf config/x86-dev.env
X-VCS-Directories: config/
X-VCS-Committer: jmbsvicetto
X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto
X-VCS-Revision: c910463c2b8607f1a62bc60cc06faead4fff9734
X-VCS-Branch: master
Date: Sat, 13 Oct 2012 13:19:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 14be2b51-0440-4e0a-bfe7-9779ee168a0e
X-Archives-Hash: 356892b7c3bbce16ade5e57a44aaee67
commit: c910463c2b8607f1a62bc60cc06faead4fff9734
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 13:18:29 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 13:18:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=c910463c
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.
---
config/amd64-auto.conf | 3 ++-
config/amd64-dev.env | 4 ----
config/{x86-dev.env => skimmer.env} | 1 -
config/x86-auto.conf | 3 ++-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf
index 93e968e..5fc4f5c 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 baceb00..0000000
--- 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
similarity index 71%
rename from config/x86-dev.env
rename to config/skimmer.env
index 36e89a7..d18400f 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 5067b65..3e37bb0 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"