[Lunar-commits] CVS: lunar-iso/scripts kernels, 1.7, 1.8 isolinux, 1.1, 1.2

[Auke Kok]

Update of /var/cvs/lunar/lunar-iso/scripts
In directory espresso.foo-projects.org:/tmp/cvs-serv1625

Modified Files:
	kernels isolinux 
Log Message:
tag: copy pre-specified kernels directly so isolinux can be generated easily (safe and linux)


Index: kernels
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/kernels,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kernels	4 Dec 2004 16:54:57 -0000	1.7
+++ kernels	3 Feb 2005 21:05:12 -0000	1.8
@@ -64,6 +64,9 @@
     mkdir -p $ISO_SOURCE/kernels/BUILD/usr/include/linux-$ISO_KVER$1
     make INSTALL_MOD_PATH=$ISO_SOURCE/kernels/BUILD modules_install
     cp arch/i386/boot/bzImage $ISO_SOURCE/kernels/BUILD/boot/$ISO_KVER$1
+    if [ -n "$2" ] ; then
+      cp arch/i386/boot/bzImage $ISO_SOURCE/kernels/$2
+    fi
     cp System.map $ISO_SOURCE/kernels/BUILD/boot/System.map-$ISO_KVER$1
     cp .config $ISO_SOURCE/kernels/BUILD/boot/config-$ISO_KVER$1
     gzip $ISO_SOURCE/kernels/BUILD/boot/config-$ISO_KVER$1
@@ -82,7 +85,7 @@
     prepare_patch $(echo $3)
     prepare_options $(echo $2)
     prepare_version $1
-    build_kernel $1
+    build_kernel $1 $6
     echo "$ISO_KVER$1:$4" >> $ISO_SOURCE/kernels/.kernels
 }
 
@@ -91,9 +94,9 @@
 > $ISO_SOURCE/kernels/.kernels
 
 build -safe-i386 "i386 nosmp lowmem safe" "fix" \
-	"Very safe i386 (default is i686) minimal kernel (no ACPI, DMA, SMP)"
+	"Very safe i386 (default is i686) minimal kernel (no ACPI, DMA, SMP)" "safe"
 build -normal "nosmp lowmem" "fix main" \
-	"Normal kernel (no SMP) (RECOMMENDED)"
+	"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" \

Index: isolinux
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/scripts/isolinux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- isolinux	22 Nov 2004 20:43:35 -0000	1.1
+++ isolinux	3 Feb 2005 21:05:12 -0000	1.2
@@ -6,8 +6,8 @@
 mkdir $ISO_TARGET/isolinux
 
 cp $ISO_SOURCE/initrd/initrd $ISO_TARGET/isolinux/
-cp $ISO_SOURCE/kernel/linux $ISO_TARGET/isolinux/
-cp $ISO_SOURCE/kernel/safe $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/kernels/linux $ISO_TARGET/isolinux/
+cp $ISO_SOURCE/kernels/safe $ISO_TARGET/isolinux/
 cp $ISO_SOURCE/memtest/memtest $ISO_TARGET/isolinux/
 
 cd $ISO_SOURCE/isolinux