summaryrefslogtreecommitdiff
path: root/conf/intel
diff options
context:
space:
mode:
Diffstat (limited to 'conf/intel')
-rw-r--r--conf/intel/portage/make.conf.amd649
-rw-r--r--conf/intel/portage/make.conf.x868
2 files changed, 2 insertions, 15 deletions
diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
index 452717b..20ea780 100644
--- a/conf/intel/portage/make.conf.amd64
+++ b/conf/intel/portage/make.conf.amd64
@@ -1,6 +1,3 @@
-# These settings were set by the catalyst build script that automatically built this stage
-# Please consult /etc/make.conf.example for a more detailed example
-
# Compiler stuff
CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe"
CHOST="x86_64-pc-linux-gnu"
@@ -36,11 +33,7 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport wiki-pub
QEMU_USER_TARGETS="x86_64 i386"
QEMU_SOFTMMU_TARGETS="x86_64 i386"
-## PORTAGE CONFIG ##
-CONFIG_PROTECT="/usr/share/config/kdm /etc"
-# /lib/modules mask is useful for our internal tinderbox
-CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
-APACHE2_MPMS="prefork"
+## MIRRORS ##
GENTOO_MIRRORS="http://ftp.romnet.org/gentoo/ http://mirror.bytemark.co.uk/gentoo/"
USE_PYTHON="2.7 3.4"
diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86
index 3b1e203..347da41 100644
--- a/conf/intel/portage/make.conf.x86
+++ b/conf/intel/portage/make.conf.x86
@@ -1,6 +1,3 @@
-# These settings were set by the catalyst build script that automatically built this stage
-# Please consult /etc/make.conf.example for a more detailed example
-
# Compiler stuff
CFLAGS="-O2 -march=i686 -mtune=generic -pipe"
CHOST="i686-pc-linux-gnu"
@@ -37,10 +34,7 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport wiki-pub
QEMU_USER_TARGETS="x86_64 i386"
QEMU_SOFTMMU_TARGETS="x86_64 i386"
-## PORTAGE CONFIG ##
-CONFIG_PROTECT="/usr/share/config/kdm /etc"
-# /lib/modules mask is useful for our internal tinderbox
-CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
+## MIRRORS ##
GENTOO_MIRRORS="http://ftp.romnet.org/gentoo/ http://mirror.bytemark.co.uk/gentoo/"
USE_PYTHON="2.7 3.4"