From 21409959d3ea96261d82a9694b295be56a385438 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Mon, 13 Feb 2012 18:47:58 +0100
Subject: [PATCH] [armv7l/portage] cannot use make.conf.common, because it will
 end up in image

---
 conf/armv7l/portage/make.conf.common | 23 ----------------------
 conf/armv7l/portage/make.conf.hardfp | 29 +++++++++++++++++++++++++++-
 conf/armv7l/portage/make.conf.softfp | 29 +++++++++++++++++++++++++++-
 git-hooks/post-merge                 |  6 ------
 4 files changed, 56 insertions(+), 31 deletions(-)
 delete mode 100644 conf/armv7l/portage/make.conf.common

diff --git a/conf/armv7l/portage/make.conf.common b/conf/armv7l/portage/make.conf.common
deleted file mode 100644
index 9d42bc2..0000000
--- a/conf/armv7l/portage/make.conf.common
+++ /dev/null
@@ -1,23 +0,0 @@
-# Portage configuration
-ACCEPT_KEYWORDS="~arm arm"
-FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
-MAKEOPTS="-j16 -s"
-CCACHE_SIZE="50G"
-# Global USE flags
-USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
-
-# distcc configuration
-DISTCC_SSH="/etc/distcc/distcc-ssh"
-# <host>/<number of jobs>
-# Works with QEMU warnings (damn)
-# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
-# Works
-DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
-# DISTCC_VERBOSE=1
-
-# Package specific configuration
-APACHE2_MPMS="prefork"
-
-# Filter out crap from packages
-INSTALL_MASK="usr/share/gtk-doc/html/*"
-PKG_INSTALL_MASK="${INSTALL_MASK}"
diff --git a/conf/armv7l/portage/make.conf.hardfp b/conf/armv7l/portage/make.conf.hardfp
index 5c6f953..9d414fa 100644
--- a/conf/armv7l/portage/make.conf.hardfp
+++ b/conf/armv7l/portage/make.conf.hardfp
@@ -6,6 +6,33 @@ CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 CHOST="armv7a-hardfloat-linux-gnueabi"
 
-source /etc/make.conf.common
+### COMMON PART
+#################################################
+# Portage configuration
+ACCEPT_KEYWORDS="~arm arm"
+FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
+MAKEOPTS="-j16 -s"
+CCACHE_SIZE="50G"
+# Global USE flags
+USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
+
+# distcc configuration
+DISTCC_SSH="/etc/distcc/distcc-ssh"
+# <host>/<number of jobs>
+# Works with QEMU warnings (damn)
+# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
+# Works
+DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
+# DISTCC_VERBOSE=1
+
+# Package specific configuration
+APACHE2_MPMS="prefork"
+
+# Filter out crap from packages
+INSTALL_MASK="usr/share/gtk-doc/html/*"
+PKG_INSTALL_MASK="${INSTALL_MASK}"
+#################################################
+### END COMMON PART -- cut here
+
 source /var/lib/layman/make.conf
 
diff --git a/conf/armv7l/portage/make.conf.softfp b/conf/armv7l/portage/make.conf.softfp
index 57bd960..e725ea8 100644
--- a/conf/armv7l/portage/make.conf.softfp
+++ b/conf/armv7l/portage/make.conf.softfp
@@ -6,5 +6,32 @@ CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 CHOST="armv7a-unknown-linux-gnueabi"
 
-source /etc/make.conf.common
+### COMMON PART
+#################################################
+# Portage configuration
+ACCEPT_KEYWORDS="~arm arm"
+FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
+MAKEOPTS="-j16 -s"
+CCACHE_SIZE="50G"
+# Global USE flags
+USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
+
+# distcc configuration
+DISTCC_SSH="/etc/distcc/distcc-ssh"
+# <host>/<number of jobs>
+# Works with QEMU warnings (damn)
+# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
+# Works
+DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
+# DISTCC_VERBOSE=1
+
+# Package specific configuration
+APACHE2_MPMS="prefork"
+
+# Filter out crap from packages
+INSTALL_MASK="usr/share/gtk-doc/html/*"
+PKG_INSTALL_MASK="${INSTALL_MASK}"
+#################################################
+### END COMMON PART -- cut here
+
 source /var/lib/layman/make.conf
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
index f45f0d1..a30e70e 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -5,7 +5,6 @@ echo "post-merge hook is executing"
 
 arch="$(uname -m)"
 src_make_conf=""
-src_make_conf_common=""
 case $arch in
 	i686)
 	src_make_conf="./conf/intel/portage/make.conf.x86"
@@ -16,10 +15,8 @@ case $arch in
 	arm*)
 	if [ -e "/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi" ]; then
 		src_make_conf="./conf/armv7l/portage/make.conf.hardfp"
-		src_make_conf_common="./conf/armv7l/portage/make.conf.common"
 	elif [ -e "/usr/lib/gcc/armv7a-unknown-linux-gnueabi" ]; then
 		src_make_conf="./conf/armv7l/portage/make.conf.softfp"
-		src_make_conf_common="./conf/armv7l/portage/make.conf.common"
 	else
 		echo "UNSUPPORTED ARM ABI, CANNOT COPY make.conf !!!"
 	fi
@@ -31,7 +28,4 @@ if [ -z "$src_make_conf" ]; then
 else
 	echo "post-merge hook: copying make.conf (from $src_make_conf):"
 	cp --no-target-directory -v "$src_make_conf" /etc/make.conf
-	if [ -n "$src_make_conf_common" ]; then
-		cp --no-target-directory -v "$src_make_conf_common" "/etc/$(basename $src_make_conf_common)"
-	fi
 fi