From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 6 Jul 2010 20:20:45 +0000 (+0200)
Subject: kernel: Fix build instructions.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66678ff458e1e9fccbd0d6df6a520d8254b4c14b;p=ipfire-3.x.git

kernel: Fix build instructions.

Add prepare commands to prepare state and remove lots of unneeded code.
---

diff --git a/pkgs/core/kernel/kernel.nm b/pkgs/core/kernel/kernel.nm
index 23cc74324..76ecef4e1 100644
--- a/pkgs/core/kernel/kernel.nm
+++ b/pkgs/core/kernel/kernel.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.kernel.org/
 PKG_LICENSE    = GPLv2
 PKG_SUMMARY    = The Linux kernel.
 
-PKG_BUILD_DEPS+= module-init-tools
+PKG_BUILD_DEPS+= module-init-tools ncurses
 PKG_DEPS       = # No dependencies
 
 define PKG_DESCRIPTION
@@ -66,32 +66,14 @@ define STAGE_PREPARE_CMDS
 	
 	cd $(DIR_APP) && cp -vf $(DIR_SOURCE)/$(DISTRO_SNAME)_logo.ppm \
 		drivers/video/logo/logo_linux_clut224.ppm
-endef
 
-define STAGE_BUILD
 	cd $(DIR_APP) && make mrproper
 
-	# Select right optimization for the linux kernel.
-	if [ "$(TARGET)" == "i486" ]; then \
-		sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
-			-e "s/^# CONFIG_M486 is not set/CONFIG_M486=y/" \
-			< $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
-	elif [ "$(TARGET)" == "i586" ]; then \
-		sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
-			-e "s/^# CONFIG_M586TSC is not set/CONFIG_M586TSC=y/" \
-			< $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
-	elif [ "$(TARGET)" == "via-c7" ]; then \
-		sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
-			-e "s/^# CONFIG_MVIAC7 is not set/CONFIG_MVIAC7=y/" \
-			< $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
-	elif [ "$(TARGET)" == "via-c3" ]; then \
-		sed -e "s/^CONFIG_M686=y/# CONFIG_686 is not set/" \
-			-e "s/^# CONFIG_MVIAC3_2 is not set/CONFIG_MVIAC3_2=y/" \
-			< $(DIR_SOURCE)/config > $(DIR_APP)/.config; \
-	else \
-		cp -f $(DIR_SOURCE)/config $(DIR_APP)/.config; \
-	fi
+	# Install configuration file
+	cp -f $(DIR_SOURCE)/config $(DIR_APP)/.config
+endef
 
+define STAGE_BUILD
 	cd $(DIR_APP) && yes "" | make oldconfig
 	
 	cd $(DIR_APP) && make CC="gcc -nopie" $(PARALLELISMFLAGS)