From 40a7d8dcce1f4e215d3b32730777c3e685273747 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Date: Mon, 17 Sep 2012 01:21:32 +0000 Subject: [PATCH] Update tools and config files for skimmer. --- config/amd64-auto.conf | 2 +- config/amd64-dev.env | 6 +++--- config/x86-auto.conf | 2 +- config/x86-dev.env | 4 ++-- tools/catalyst-auto-amd64.conf | 2 +- tools/catalyst-auto-x86.conf | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf index 503992b2..ede7ef6c 100644 --- a/config/amd64-auto.conf +++ b/config/amd64-auto.conf @@ -1,7 +1,7 @@ distdir="/usr/portage/distfiles" portdir="/release/trees/portage-auto" options="autoresume ccache kerncache pkgcache seedcache snapcache" -sharedir="/usr/lib/catalyst/" +sharedir="/usr/lib64/catalyst/" storedir="/release/buildroot/amd64-dev" envscript="/etc/catalyst/release/amd64-dev.env" hash_function="crc32" diff --git a/config/amd64-dev.env b/config/amd64-dev.env index 4d470373..baceb002 100644 --- a/config/amd64-dev.env +++ b/config/amd64-dev.env @@ -1,4 +1,4 @@ -export GENTOO_MIRRORS="http://gentoo.osuosl.org/" +#export GENTOO_MIRRORS="http://gentoo.osuosl.org/" +export GENTOO_MIRRORS="http://mirror.ovh.net/gentoo-distfiles/" export FEATURES="parallel-fetch" -export MAKEOPTS="-j3" -#export MAKEOPTS="-j8 -l2" +export MAKEOPTS="-j5 -l4" diff --git a/config/x86-auto.conf b/config/x86-auto.conf index 39430c68..d999c047 100644 --- a/config/x86-auto.conf +++ b/config/x86-auto.conf @@ -1,7 +1,7 @@ distdir="/usr/portage/distfiles" portdir="/release/trees/portage-auto" options="autoresume ccache kerncache pkgcache seedcache snapcache" -sharedir="/usr/lib/catalyst/" +sharedir="/usr/lib64/catalyst/" storedir="/release/buildroot/x86-dev" envscript="/etc/catalyst/release/x86-dev.env" hash_function="crc32" diff --git a/config/x86-dev.env b/config/x86-dev.env index 4d470373..36e89a78 100644 --- a/config/x86-dev.env +++ b/config/x86-dev.env @@ -1,4 +1,4 @@ export GENTOO_MIRRORS="http://gentoo.osuosl.org/" +export GENTOO_MIRRORS="http://mirror.ovh.net/gentoo-distfiles/" export FEATURES="parallel-fetch" -export MAKEOPTS="-j3" -#export MAKEOPTS="-j8 -l2" +export MAKEOPTS="-j5 -l4" diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 25e02f2e..49d046d4 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -24,7 +24,7 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]" -CATALYST_CONFIG=/etc/catalyst/${ARCH}-auto.conf +CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/ diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index db2744b4..818c5f4d 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -22,7 +22,7 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]" -CATALYST_CONFIG=/etc/catalyst/${ARCH}-auto.conf +CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/