diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-15 19:15:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-15 19:15:21 +0000 |
| commit | 4b5643f01b113f9829b7b41833e400e9e6a6e1a0 (patch) | |
| tree | 24fb8f924a96b78b71c2ff7b1e6da38d461e918b | |
| parent | 255d75dfd3e996e0df9a30d12bd5574aabbf226e (diff) | |
Revert "make use of /etc/sisyphus/mirrors.conf"
This reverts commit 255d75dfd3e996e0df9a30d12bd5574aabbf226e.
| -rw-r--r-- | conf/intel/portage/make.conf.amd64-binmode | 9 | ||||
| -rw-r--r-- | conf/intel/portage/make.conf.amd64-mixedmode | 9 | ||||
| -rw-r--r-- | conf/intel/portage/make.conf.amd64-srcmode | 9 |
3 files changed, 3 insertions, 24 deletions
diff --git a/conf/intel/portage/make.conf.amd64-binmode b/conf/intel/portage/make.conf.amd64-binmode index 52dcf57..bbd3dd8 100644 --- a/conf/intel/portage/make.conf.amd64-binmode +++ b/conf/intel/portage/make.conf.amd64-binmode @@ -2,8 +2,8 @@ FEATURES="parallel-fetch protect-owned candy compressdebug splitdebug -userpriv" EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkgonly --rebuilt-binaries" -## PORTAGE CONFIG ## source /etc/portage/global.conf/abi.conf +source /etc/portage/global.conf/binhost.conf source /etc/portage/global.conf/cflags.conf source /etc/portage/global.conf/cpuflags.conf source /etc/portage/global.conf/devices.conf @@ -17,10 +17,3 @@ source /etc/portage/global.conf/python.conf source /etc/portage/global.conf/qemu.conf source /etc/portage/global.conf/ruby.conf source /etc/portage/global.conf/useflags.conf - -## MIRROR CONFIG ## -if [[ -f /etc/sisyphus/mirrors.conf ]] ; then - source /etc/sisyphus/mirrors.conf -else - source /etc/portage/global.conf/binhost.conf -fi diff --git a/conf/intel/portage/make.conf.amd64-mixedmode b/conf/intel/portage/make.conf.amd64-mixedmode index 2b06174..0961dbe 100644 --- a/conf/intel/portage/make.conf.amd64-mixedmode +++ b/conf/intel/portage/make.conf.amd64-mixedmode @@ -2,8 +2,8 @@ FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv" EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkg --rebuilt-binaries" -## PORTAGE CONFIG ## source /etc/portage/global.conf/abi.conf +source /etc/portage/global.conf/binhost.conf source /etc/portage/global.conf/cflags.conf source /etc/portage/global.conf/cpuflags.conf source /etc/portage/global.conf/devices.conf @@ -17,10 +17,3 @@ source /etc/portage/global.conf/python.conf source /etc/portage/global.conf/qemu.conf source /etc/portage/global.conf/ruby.conf source /etc/portage/global.conf/useflags.conf - -## MIRROR CONFIG ## -if [[ -f /etc/sisyphus/mirrors.conf ]] ; then - source /etc/sisyphus/mirrors.conf -else - source /etc/portage/global.conf/binhost.conf -fi diff --git a/conf/intel/portage/make.conf.amd64-srcmode b/conf/intel/portage/make.conf.amd64-srcmode index 3deaa10..d00e308 100644 --- a/conf/intel/portage/make.conf.amd64-srcmode +++ b/conf/intel/portage/make.conf.amd64-srcmode @@ -1,8 +1,8 @@ ## PORTAGE FEATURES ## FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv" -## PORTAGE CONFIG ## source /etc/portage/global.conf/abi.conf +source /etc/portage/global.conf/binhost.conf source /etc/portage/global.conf/cflags.conf source /etc/portage/global.conf/cpuflags.conf source /etc/portage/global.conf/devices.conf @@ -16,10 +16,3 @@ source /etc/portage/global.conf/python.conf source /etc/portage/global.conf/qemu.conf source /etc/portage/global.conf/ruby.conf source /etc/portage/global.conf/useflags.conf - -## MIRROR CONFIG ## -if [[ -f /etc/sisyphus/mirrors.conf ]] ; then - source /etc/sisyphus/mirrors.conf -else - source /etc/portage/global.conf/binhost.conf -fi |