another taroon merge. tagged before as before-taroon-merge, after as

after-taroon-merge

this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.

1 files changed, 33 insertions, 43 deletions

diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index c6395684c..ea8569c0e 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -40,12 +40,12 @@ EOF
 	mount -o loop -t ext2 $MBD_TMPIMAGE $MBD_BOOTTREE
 }
 
+makeBootImages() {
+    mkdir -p $TOPDESTPATH/boot
+    cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
 
-mkdir -p $TOPDESTPATH/boot
-cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
-
-mkdir -p $TOPDESTPATH/etc
-cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
+    mkdir -p $TOPDESTPATH/etc
+    cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
 #
 # Red Hat Linux/Alpha aboot configuration options:
 #
@@ -61,47 +61,37 @@ cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
 
 EOF
 
-makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.img \
-	   --initrdsize 4096 \
-	   --padsize 1440 \
-	   --loaderbin loader \
-	   --modules "$NETMODULES $SCSIMODULES"
-
-makeinitrd --initrdto $TOPDESTPATH/images/cdrom.img \
-	   --initrdsize 8192 \
-	   --loaderbin loader \
-	   --modules "$NETMODULES $SCSIMODULES $EXTRASCSI $EXTRANET"
-
-makebootdisk --bootdisksize 1440 --kernelto $TOPDESTPATH/kernels/vmlinux.gz \
-	     --imagename generic.img
-
+    makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.img \
+	--initrdsize 4096 \
+	--padsize 1440 \
+	--loaderbin loader \
+	--modules "$NETMODULES $SCSIMODULES"
 
-makemainmodules "$SECSTAGE"
-makeinstimage "netstg" "$SECSTAGE"
-makeinstimage "hdstg" "$SECSTAGE"
-makemainimage "stage2" "cramfs "
+    makeinitrd --initrdto $TOPDESTPATH/images/cdrom.img \
+	--initrdsize 8192 \
+	--loaderbin loader \
+	--modules "$NETMODULES $SCSIMODULES $EXTRASCSI $EXTRANET"
 
+    makebootdisk --bootdisksize 1440 --kernelto $TOPDESTPATH/kernels/vmlinux.gz \
+	--imagename generic.img
 
-if [ -f $TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm ]; then
-    K24_PKG=$TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm
-    K24_DIR=/tmp/kernel24.dir.$$
-    mkdir -p $K24_DIR
-    rpm2cpio $K24_PKG | (cd $K24_DIR; cpio --quiet -iumd ./boot/vmlinuz-*)
-    cp $K24_DIR/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinuz.24
-    rm -rf $K24_DIR
-fi
 
+    if [ -f $KERNELPATH/kernel-jensen-*.rpm ]; then
+	KJ_PKG=$KERNELPATH/kernel-jensen-*.rpm
+	KJ_DIR=/tmp/kernelj.dir.$$
+	mkdir -p $KJ_DIR
+	rpm2cpio $KJ_PKG | (cd $KJ_DIR; cpio --quiet -iumd ./boot/vmlinuz-*)
+	cp $KJ_DIR/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinuz.j
+	rm -rf $KJ_DIR
+    fi
 
-if [ -f $KERNELPATH/kernel-jensen-*.rpm ]; then
-    KJ_PKG=$KERNELPATH/kernel-jensen-*.rpm
-    KJ_DIR=/tmp/kernelj.dir.$$
-    mkdir -p $KJ_DIR
-    rpm2cpio $KJ_PKG | (cd $KJ_DIR; cpio --quiet -iumd ./boot/vmlinuz-*)
-    cp $KJ_DIR/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinuz.j
-    rm -rf $KJ_DIR
-fi
-
-makedriverdisk --padsize 1440 "Supplemental Block Device Drivers" "drvblock" "$SCSIMODULES $EXTRASCSI +scsi"
-makedriverdisk --padsize 1440 "Supplemental Network Device Drivers" "drvnet" "$NETMODULES $EXTRANET  +net"
-
+    makedriverdisk --padsize 1440 "Supplemental Block Device Drivers" "drvblock" "$SCSIMODULES $EXTRASCSI +scsi"
+    makedriverdisk --padsize 1440 "Supplemental Network Device Drivers" "drvnet" "$NETMODULES $EXTRANET  +net"
+}
 
+makeSecondStage() {
+    makemainmodules "$SECSTAGE"
+    makeinstimage "netstg" "$SECSTAGE"
+    makeinstimage "hdstg" "$SECSTAGE"
+    makemainimage "stage2" "cramfs "
+}