[Lunar-commits] r18465 - lunar-iso/trunk/scripts

[Auke Kok]

Author: sofar
Date: 2006-02-01 18:05:24 +0000 (Wed, 01 Feb 2006)
New Revision: 18465

Modified:
   lunar-iso/trunk/scripts/kernels
Log:
Move kernel build lines into config area.


Modified: lunar-iso/trunk/scripts/kernels
===================================================================
--- lunar-iso/trunk/scripts/kernels	2006-02-01 17:51:41 UTC (rev 18464)
+++ lunar-iso/trunk/scripts/kernels	2006-02-01 18:05:24 UTC (rev 18465)
@@ -138,52 +138,8 @@
 rm -f $ISO_SOURCE/kernels/{{safe,linux}{,.map,-modules.tar.bz2}}
 rm -rf $ISO_SOURCE/kernels/TAR
 
+# the actual 'build' lines are now sourced from the conf directory:
+source $ISO_SOURCE/kernels/conf/${ISO_KSUFFIX}/build
 
-if [ "${ISO_KSUFFIX}" = "2.4" ]; then
-	
-	# required
-	build -safe-i386 "i386 nosmp lowmem safe" "fix" \
-		"Very safe i386 (default is i686) minimal kernel (no ACPI, DMA, SMP)" "safe"
-	# recommended
-	build -normal "nosmp lowmem" "fix main" \
-		"Normal kernel (no SMP) (RECOMMENDED)" "linux"
-	build -smp-4gb "smp mem" "fix main" \
-		"Normal SMP kernel with large memory (4GB)"
-	# build -agr "nosmp lowmem lowlat" "fix main aggressive" \
-	# 	"Low latency patch"
-	build -agr-smp-4gb "smp mem lowlat" "fix main aggressive" \
-		"Low latency patch, SMP, 4GB"
-	# build -stb "nosmp lowmem" "fix" \
-	# 	"Minimally patched"
-	# build -stb-smp-4gb "smp mem" "fix" \
-	# 	"Minimally patched, SMP, 4GB"
-	# build -vnl "nosmp lowmem" "" \
-	# 	"Unpatched"
-	build -vnl-smp-4gb "smp mem" "" \
-		"Unpatched, SMP, 4GB"
-	# build -grs "nosmp lowmem grsec" "fix main grsecurity" \
-	# 	"Grsecurity patch"
-	build -grs-smp-4gb "smp mem grsec" "fix main grsecurity" \
-		"Grsecurity patch, SMP, 4GB"
-	# build -om "nosmp lowmem om" "fix om" \
-	# 	"OpenMosix clustering"
-	# build -om-smp-4gb "smp mem om" "fix om" \
-	# 	"OpenMosix clustering, SMP, 4GB"
-
-else # [ "${ISO_KSUFFIX}" = "2.6" ]; then
-
-	build -safe-i386 "i386 nosmp lowmem safe" "" \
-		"Very safe i386 (default is i686) minimal kernel (no ACPI, DMA, SMP)" "safe"
-	build -normal "nosmp lowmem" "" \
-		"Normal kernel (no SMP, 1GB memory max) (RECOMMENDED)" "linux"
-	build -smp-4gb "server smp mem" "" \
-		"Server-optimized SMP kernel with large memory (4GB)"
-	build -grs "nosmp lowmem grsec" "grsec" \
-		"Grsecurity patch" ""
-	build -grs-smp-4gb "server smp mem grsec" "grsec" \
-		"Grsecurity, server optimized patch, SMP, 4GB" ""
-
-fi
-
 mv $ISO_SOURCE/kernels/.kernels-tmp $ISO_SOURCE/kernels/.kernels
 mv $ISO_SOURCE/kernels/.initrd_kernels-tmp $ISO_SOURCE/kernels/.initrd_kernels