From 9e7d3512925a1c1200fef2644d26800f51247214 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 10 Feb 2011 13:06:05 +0100
Subject: [PATCH] kernel: simplify some parts in template file.

---
 srcpkgs/kernel/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 28f4f5f27e..2c5c37a3b0 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -33,8 +33,9 @@ Add_dependency build perl
 
 do_build()
 {
-	# If there's a file called kernel-<arch>-dotconfig, use it to
-	# configure the kernel; otherwise run the menuconfig target.
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
 	local arch
 
 	if [ "$xbps_machine" != "x86_64" ]; then
@@ -43,19 +44,18 @@ do_build()
 		arch=x86_64
 	fi
 
-	cd ${wrksrc}
-
 	# Configure
-	if [ -f ${FILESDIR}/$arch-dotconfig ]; then
+	if [ -f ${FILESDIR}/${arch}-dotconfig ]; then
 		msg_normal " Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/$arch-dotconfig ${wrksrc}/.config
+		cp -f ${FILESDIR}/${arch}-dotconfig .config
 		make ${makejobs} oldconfig
 	else
-		make ${makejobs} menuconfig
+		msg_normal " Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} defconfig && make ${makejobs} allmodconfig
 	fi
 	if [ -n "${revision}" ]; then
 		sed -i -e "s|LOCALVERSION=\"\"|LOCALVERSION=\"_${revision}\"|" \
-			${wrksrc}/.config
+			.config
 	fi
 	# Build
 	make ${makejobs} prepare
@@ -72,8 +72,6 @@ do_install()
 		arch=x86_64
 	fi
 
-	cd ${wrksrc}
-
 	# Install kernel, firmware and modules
 	make INSTALL_MOD_PATH=${DESTDIR} modules_install