genkernel with fixes for new --build-src and --build-dst feature. 3.4.12.6-r4v3.4.12.6-r4-funtoo

4 files changed, 6 insertions, 6 deletions

diff --git a/gen_compile.sh b/gen_compile.sh
index 446dcc0..373d1ef 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -29,7 +29,7 @@ compile_kernel_args() {
 		ARGS="${ARGS} INSTALL_FW_PATH=\"${FIRMWARE_DST}\""
 	fi
 	# point to the sources we are building:
-	ARGS="${ARGS} O=\"${BUILD_SRC}\""
+	ARGS="${ARGS} O=\"${BUILD_DST}\""
 	echo -n "${ARGS}"
 }
 
@@ -330,7 +330,7 @@ compile_kernel() {
 			"kernel-${KNAME}-${ARCH}-${KV}"
 
 		copy_image_with_preserve "System.map" \
-			"System.map" \
+			"${BUILD_DST}/System.map" \
 			"System.map-${KNAME}-${ARCH}-${KV}"
 
 		if isTrue "${GENZIMAGE}"
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index d338652..04be268 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -28,7 +28,7 @@ determine_config_file() {
 
 config_kernel() {
 	determine_config_file
-	cd "${BUILD_DST}" || gen_die 'Could not switch to the kernel directory!'
+	cd "${BUILD_SRC}" || gen_die 'Could not switch to the kernel directory!'
 
 	# Backup current kernel .config
 	if isTrue "${MRPROPER}" || [ ! -f "${BUILD_DST}/.config" ]
@@ -132,4 +132,4 @@ config_kernel() {
 	then
 		sed -i ${BUILD_DST}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
 	fi
-}/
+}
diff --git a/gen_funcs.sh b/gen_funcs.sh
index 2996378..febbc00 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -512,7 +512,7 @@ find_kernel_binary() {
 	do
 		if [ -e "${i}" ]
 		then
-			tmp_kernel_binary=$i
+			tmp_kernel_binary=$(pwd)/$i
 			break
 		fi
 	done
diff --git a/genkernel b/genkernel
index 26111c5..69e0950 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.12.6-r3'
+GK_V='3.4.12.6-r4'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.