and now the parts of the scripts changes that are mergable.after.390.merge

WOOHOO!  s/390 is now pretty much merged to HEAD except for the bits
of mail I'm about to send out

4 files changed, 163 insertions, 36 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index df848d1fa..480e57bc4 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -113,7 +113,7 @@ findPackage() {
 
 findmodule () {
     if [ ! -f $CACHE ]; then
-        find $KERNELROOT/lib/modules > $CACHE
+        find $KERNELROOT/lib/modules/ > $CACHE
     fi
     
     grep "/$1\.o" $CACHE
@@ -301,6 +301,10 @@ makemainmodules() {
     rm -rf $FULLMODPATH
     rm -rf $FINALFULLMODPATH
 
+    if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
+       mkdir -p $KERNELROOT/lib/modules/misc
+       cp -f $KERNELROOT/lib/modules/*/kernel/drivers/s390/*/* $KERNELROOT/lib/modules/misc
+    fi
     makemoduleball $extraargs $FULLMODPATH "$modlist"
     cp -ar $FULLMODPATH $FINALFULLMODPATH
     rm -rf $FULLMODPATH
@@ -470,7 +474,7 @@ EOF
 EOF
     ln -s fb0 $MBD_DIR/dev/fb
 
-    dd if=/dev/zero of=$MBD_DIR/etc/ramfs.img.big bs=1k count=12000
+    dd if=/dev/zero of=$MBD_DIR/etc/ramfs.img.big bs=1k count=16000
     mke2fs -Fq $MBD_DIR/etc/ramfs.img.big
     gzip -9 < $MBD_DIR/etc/ramfs.img.big > $MBD_DIR/etc/ramfs.img
     rm -f $MBD_DIR/etc/ramfs.img.big
@@ -624,6 +628,10 @@ makeinstimage () {
 
     mkdir -p $tmpdir
     (cd $INSTIMGTEMPLATE; find . | cpio --quiet -p $tmpdir)
+    if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
+       mkdir -p $KERNELROOT/lib/modules/misc
+       cp -f $KERNELROOT/lib/modules/*/kernel/drivers/s390/*/* $KERNELROOT/lib/modules/misc
+    fi
     makemoduleball $tmpdir/modules "$modlist"
 
     mkcramfs $tmpdir $INSTIMGPATH/${imagename}1.img
@@ -748,19 +756,17 @@ makedriverdisk () {
 }
 
 # Find the kernel, unpack it, and verify it
-    kpackage=$($LATEST $KERNELPATH kernel-BOOT)
-    vertag=BOOT
+vertag="BOOT"
+if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
+    vertag="BOOT BOOTtape"
+fi
+for kernelvers in $vertag; do
+    kpackage=$($LATEST $KERNELPATH kernel-$kernelvers)
+    mkdir -p $KERNELROOT/lib/modules/misc
     if [ ! -f "$kpackage" ]; then
-	if [ "$BUILDARCH" == "ia64" ]; then
-	    # XXX remove me post beta
-	    echo 'kernel-BOOT does not exist -- using kernel-smp package on ia64'
-	    kpackage=$($LATEST $KERNELPATH kernel-smp)
-	    vertag="smp"
-	else
-	    echo 'kernel-BOOT does not exist -- using kernel package'
-	    kpackage=$($LATEST $KERNELPATH kernel)
-	    vertag=""
-	fi
+	echo 'kernel-$kernelvers does not exist -- using kernel package'
+	kpackage=$($LATEST $KERNELPATH kernel)
+	vertag=""
     fi
 
     ppackage=$($LATEST $KERNELPATH kernel-pcmcia-cs)
@@ -768,7 +774,8 @@ makedriverdisk () {
 	ppackage=""
     fi
 
-    version=$(rpm --qf '%{VERSION}-%{RELEASE}' -qp $kpackage)${vertag}
+    version=$(rpm --qf '%{VERSION}-%{RELEASE}' -qp $kpackage)${kernelvers}
+    echo "unpacking $kpackage"
 
     rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd)
     if [ ! -z $ppackage ]; then 
@@ -785,7 +792,7 @@ makedriverdisk () {
 	usage
     fi
 
-    if [ -d $KERNELROOT/lib/modules/$version/pcmcia ]; then
+    if [ -d $KERNELROOT/lib/modules/$version/pcmcia -a -f KERNELROOT/etc/pcmcia/config ]; then
 	# This gets all of the modules in the pcmcia directory, as well as
 	# everything mentioned in /etc/pcmcia/config
 	PCMCIAMODULES=$((perl -e 'while (<>) { s/^.*class.*module +"// || next; s/[" ]//g; s/,/\n/g; print }' $KERNELROOT/etc/pcmcia/config;
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index a64360ec7..4c180fef1 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -37,20 +37,29 @@ prepareBootImage() {
 IDEMODS=""
 SCSIMODS=""
 
-#SECSTAGE="raid0 raid1 raid5 ext3 $IDEMODS $SCSIMODS "
-SECSTAGE="$IDEMODS $SCSIMODS "
+SECSTAGE="$IDEMODS $SCSIMODS raid0 raid1 raid5"
 
-COMMONMODULES="vfat"
+COMMONMODULES="loop cramfs dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod tape390 isofs ext3"
 LOCALMODULES="$COMMONMODULES tape390 $IDEMODS $SCSIMODS"
-NETWORKMODULES="$COMMONMODULES nfs ctc netiucv"
+NETWORKMODULES="$COMMONMODULES nfs ctc netiucv ipv6"
 
+echo "In mk-images.s390: kernelvers is $kernelvers"
+if [ "$kernelvers" = "BOOT" ]; then
+    makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
+	   --initrdsize 8192 \
+	   --loaderbin loader \
+	   --modules "$NETWORKMODULES"
+    cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
+fi
 
-makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
-	   --initrdsize 6000 \
+if [ "$kernelvers" = "BOOTtape" ]; then
+    makeinitrd --initrdto $TOPDESTPATH/images/tapeinrd.img \
+	   --initrdsize 8192 \
 	   --loaderbin loader \
 	   --modules "$NETWORKMODULES"
+    cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/tapekrnl.img
+fi
 
-#for I in $BOOTDISKDIR; do
 for I in `find $BOOTDISKDIR -type d`; do
     BOOTLANG=`basename $I`
     BOOTDIR=`basename $I | cut -d'_' -f1`
@@ -61,14 +70,19 @@ for I in `find $BOOTDISKDIR -type d`; do
     fi
 done
 
-#makedriverdisk --padsize 1440 "Supplemental Drivers" "drivers" "+scsi +net"
+#makebootdisk --kernelto $TOPDESTPATH/boot/vmlinuz  \
+#	 --bootdisksize 1440 \
+#	 --imagename $BOOTDIR/kernel.img #\
+#	 #--initrd $TOPDESTPATH//autoboot/initrd.img
 
 unset BOOTLANG
 unset BOOTDIR
 
+if [ "$kernelvers" = "BOOT" ]; then
 makemainmodules "=scsi =net $SECSTAGE"
 
 makeinstimage "netstg" "=scsi $SECSTAGE"
-#makeinstimage "hdstg" "=net $SECSTAGE"
-#makemainimage "stage2" "cramfs"
-makemainimage "stage2" "ext2"
+
+makeinstimage "hdstg" "=net $SECSTAGE"
+makemainimage "stage2" "cramfs"
+fi
diff --git a/scripts/scrubtree b/scripts/scrubtree
index 5f4d6855b..54e891521 100755
--- a/scripts/scrubtree
+++ b/scripts/scrubtree
@@ -21,7 +21,11 @@ mkdir $p/proc
 mount -t proc proc $p/proc
 [ -d $p/usr/X11R6/lib ] && echo /usr/X11R6/lib > $p/etc/ld.so.conf
 (cd $p; /usr/sbin/chroot $p usr/sbin/ldconfig )
-rm -f $p/usr/sbin/ldconfig $p/etc/ld.so.conf
+
+if [ $ARCH != s390 -a $ARCH != s390x ]; then
+    rm -f $p/usr/sbin/ldconfig 
+fi
+rm $p/etc/ld.so.conf
 
 (cd $p/usr/bin; ./collage | $p/usr/lib/anaconda-runtime/mkcollagelinks ./collage)
 
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index e96c8f855..26bbf14a6 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -105,6 +105,13 @@ if [ $ARCH = ia64 ]; then
     PACKAGES="$PACKAGES elilo slang"
 fi
 
+if [ $ARCH = s390 -o $ARCH = s390x ]; then
+    PACKAGES="$PACKAGES s390utils oco binutils s390installer pdksh wget 
+	sed net-tools inetd openssh openssh-server fileutils modutils
+	initscripts mount gawk xauth
+	portmap textutils sh-utils telnet-server login ssh_keys"
+fi
+
 # xpm is missing
 
 # Some packages are listed twice, but that's okay
@@ -154,6 +161,13 @@ if [ $ARCH = ia64 ]; then
     PACKAGESGR="$PACKAGESGR elilo slang"
 fi
 
+if [ $ARCH = s390 -o $ARCH = s390x ]; then
+    PACKAGESGR="$PACKAGESGR s390utils oco binutils s390installer pdksh 
+	sed net-tools inetd openssh openssh-server fileutils login 
+	wget initscripts xauth
+	modutils portmap textutils openssl telnet-server strace ssh_keys"
+fi
+
 KEEPFILE=/tmp/keepfile.$$
 cat > $KEEPFILE <<EOF
 boot/efi/elilo.efi
@@ -250,6 +264,81 @@ usr/share/kudzu/pcitable
 usr/share/pci.ids
 EOF
 
+if [ $ARCH = s390 -o $ARCH = s390x ]; then
+    cat >> $KEEPFILE <<EOF
+linuxrc
+usr/share/terminfo/a/ansi
+usr/share/terminfo/d/dumb
+usr/share/terminfo/s/screen
+usr/share/terminfo/v/vt100
+usr/share/terminfo/v/vt102
+usr/share/terminfo/x/xterm
+usr/bin/strace
+usr/bin/ldd
+usr/bin/wget
+usr/bin/printf
+usr/bin/dasdformat
+usr/bin/formatmnt
+usr/bin/mountpoint
+usr/bin/netsetup
+usr/bin/pkgselect
+usr/bin/pkgsrc
+usr/sbin/chroot
+usr/sbin/sshd
+usr/sbin/glibc_post_upgrade
+usr/sbin/inetd
+usr/sbin/in.telnetd
+sbin/busybox.anaconda
+sbin/consoletype
+sbin/rhsetup
+sbin/ifconfig
+sbin/route
+sbin/portmap
+sbin/fdasd
+sbin/dasdfmt
+sbin/swapon
+sbin/swapoff
+sbin/mkswap
+sbin/tune2fs
+bin/dd
+bin/gawk-3.1.0
+bin/mknod
+bin/login
+bin/ksh
+bin/cat
+bin/chmod
+bin/sed
+bin/sort
+bin/mount
+bin/umount
+bin/rpm
+lib/libpam.so*
+lib/libdl.so*
+lib/libdl-*.so*
+usr/lib/libz.so*
+lib/libnsl.so*
+lib/libnsl-*.so*
+lib/libnss*
+lib/libutil.so*
+lib/libutil-*.so*
+lib/libcrypt*
+lib/libc.so*
+lib/libc-*so*
+lib/ld.so*
+lib/ld-*.so*
+lib/libresolv.so*
+lib/libresolv-*.so*
+lib/libvtoc*.so*
+lib/modules/ibm*
+etc/inetd.conf
+etc/ssh/*
+etc/motd
+etc/issue.net
+usr/X11R6/bin/xauth
+EOF
+fi
+      
+
 KEEPFILEGR=/tmp/keepfilegr.$$
 cp $KEEPFILE $KEEPFILEGR
 cat >> $KEEPFILEGR <<EOF
@@ -534,6 +623,15 @@ rm -rf $TZDIR
 
 chown -R root:root $DEST $DESTGR
 chmod -R a+rX-w $DEST $DESTGR
+if [ $ARCH = s390 -o $ARCH = s390x ]; then
+    for i in $DEST $DESTGR; do
+	(cd $i/etc/ssh; chmod og-r ssh_host*key primes sshd_config)
+	mv $i/bin/sed $i/bin/sed_save
+	mv $i/bin/mount $i/bin/mount_save
+	mv $i/bin/sort $i/bin/sort_save
+	mv $i/bin/mknod $i/bin/mknod_save
+    done
+fi
 
 if [ $ARCH = sparc ]; then
     rm -f $DESTGR/usr/X11R6/bin/XF86_VGA16
@@ -644,7 +742,9 @@ for p in $DEST $DESTGR; do
 	    rm -f $p/usr/lib/lib$f.so
 	done
 
-	(cd $p/lib; rm -f libnss_files.so.1 libnss_dns.so.1)
+	if [ "$ARCH" != "s390" -a "$ARCH" != "s390x" ]; then
+	   (cd $p/lib; rm -f libnss_files.so.1 libnss_dns.so.1)
+	fi
 
 	(cd /usr/share/zoneinfo; find . -type f -or -type l | 
 		grep '^./[A-Z]' | sort | sed 's/^..//' | 
@@ -717,17 +817,19 @@ for p in $DEST $DESTGR; do
 	done
 done
 
-if [ $NEEDGR ]; then
-    # Xserver needs a place to put the compiled xkb maps.
-    rm -rf $DESTGR/usr/X11R6/lib/X11/xkb/compiled
-    ln -s /tmp $DESTGR/usr/X11R6/lib/X11/xkb/compiled
-fi
-
 # this is only for the minimal second stage
 echo "Cleaning ramdisk install images..."
     rm -rf $DEST/usr/lib/anaconda-runtime
 
-if [ -n "$NEEDGR" ]; then
+if [ "$ARCH" != "s390" -a "$ARCH" != "s390x" ]; then
+   if [ $NEEDGR ]; then
+       # Xserver needs a place to put the compiled xkb maps.
+       rm -rf $DESTGR/usr/X11R6/lib/X11/xkb/compiled
+       ln -s /tmp $DESTGR/usr/X11R6/lib/X11/xkb/compiled
+   fi
+
+   if [ -n "$NEEDGR" ]; then
     cd $ORIGDIR
     $DESTGR/usr/lib/anaconda-runtime/checkcards.py $DESTGR/usr/share/kudzu/pcitable $DESTGR/usr/X11R6/lib/X11/Cards
+   fi
 fi