From 8e0004e71fc8b35b713119d2fbd7cd8178891f98 Mon Sep 17 00:00:00 2001 From: Geaaru Date: Sat, 1 Apr 2017 15:44:03 +0200 Subject: [PATCH] Remove deprecated source of /var/lib/layman/make.conf. Now it is used repos.conf mode --- conf/armhfp/portage/make.conf | 3 --- conf/armv6l/portage/make.conf | 2 -- conf/armv7l/portage/make.conf | 3 --- conf/intel/portage/make.conf.amd64 | 1 - conf/intel/portage/make.conf.x86 | 1 - 5 files changed, 10 deletions(-) diff --git a/conf/armhfp/portage/make.conf b/conf/armhfp/portage/make.conf index 6e24365e..f0f24fbd 100644 --- a/conf/armhfp/portage/make.conf +++ b/conf/armhfp/portage/make.conf @@ -45,6 +45,3 @@ RUBY_TARGETS="ruby21" ################################################# ### END COMMON PART -- cut here - -source /var/lib/layman/make.conf - diff --git a/conf/armv6l/portage/make.conf b/conf/armv6l/portage/make.conf index 077e6d5c..1d8e169a 100644 --- a/conf/armv6l/portage/make.conf +++ b/conf/armv6l/portage/make.conf @@ -39,5 +39,3 @@ USE_PYTHON="2.7" ################################################# ### END COMMON PART -- cut here - -source /var/lib/layman/make.conf diff --git a/conf/armv7l/portage/make.conf b/conf/armv7l/portage/make.conf index ba188d60..097fae95 100644 --- a/conf/armv7l/portage/make.conf +++ b/conf/armv7l/portage/make.conf @@ -43,6 +43,3 @@ USE_PYTHON="2.7" ################################################# ### END COMMON PART -- cut here - -source /var/lib/layman/make.conf - diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64 index ce1109f8..c53c3ce0 100644 --- a/conf/intel/portage/make.conf.amd64 +++ b/conf/intel/portage/make.conf.amd64 @@ -49,7 +49,6 @@ QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el ## PORTAGE CONFIG ## PORTDIR_OVERLAY="/usr/local/portage" -source /var/lib/layman/make.conf CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d" # /lib/modules mask is useful for our internal tinderbox CONFIG_PROTECT_MASK="/etc/skel /lib/modules" diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86 index f67d67ec..ceb12beb 100644 --- a/conf/intel/portage/make.conf.x86 +++ b/conf/intel/portage/make.conf.x86 @@ -52,7 +52,6 @@ QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el ## PORTAGE CONFIG ## PORTDIR_OVERLAY="/usr/local/portage" -source /var/lib/layman/make.conf CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d" # /lib/modules mask is useful for our internal tinderbox CONFIG_PROTECT_MASK="/etc/skel /lib/modules"