*** empty log message ***

4 files changed, 87 insertions, 19 deletions

diff --git a/scripts/buildinstall b/scripts/buildinstall
new file mode 100755
index 000000000..b5ced2422
--- /dev/null
+++ b/scripts/buildinstall
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+if [ ! -d $1/RedHat/RPMS ]; then
+    echo $1 is not a Red Hat image >&2
+    exit 1
+fi
+
+BUILDINSTDIR=/tmp/buildinstall
+
+rm -rf $BUILDINSTDIR
+mkdir -p $BUILDINSTDIR
+
+UPD_INSTROOT=./upd-instroot
+MK_IMAGES=./mk-images
+
+if [ ! -f $UPD_INSTROOT ]; then
+    cd $BUILDINSTDIR
+    rpm2cpio < $1/RedHat/RPMS/anaconda-runtime[0-9]* | cpio -ivumd usr/lib/anaconda-runtime/upd-instroot
+    mv usr/lib/anaconda-runtime/upd-instroot .
+    rm -rf usr
+    UPD_INSTROOT=$BUILDINSTDIR/upd-instroot
+fi
+
+if [ ! -f $MK_IMAGES ]; then
+    cd $BUILDINSTDIR
+    rpm2cpio < $1/RedHat/RPMS/anaconda-runtime[0-9]* | cpio -ivumd usr/lib/anaconda-runtime/mk-images
+    mv usr/lib/anaconda-runtime/mk-images .
+    rm -rf usr
+    UPD_INSTROOT=$MK_IMAGES/mk-images
+fi
+
+$UPD_INSTROOT $1/RedHat/RPMS $1
+$MK_IMAGES dist-7.0 /mnt/redhat/test/oot/i386/images /mnt/redhat/test/oot/i386/RedHat/instimage/modules
+
+
diff --git a/scripts/mk-images b/scripts/mk-images
index a242d418e..844d11bcf 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -31,12 +31,13 @@ if [ -z "$1" -o -z "$2" -o -z "$3" ]; then usage; fi
     LOADERBINDIR=$FULLMODPATH/../usr/lib/anaconda-runtime/loader
     BOOTDISKDIR=$FULLMODPATH/../usr/lib/anaconda-runtime/boot
     LANGTABLE=$FULLMODPATH/../usr/lib/anaconda/lang-table
+    SYSLINUX=$FULLMODPATH/../usr/bin/syslinux
     PCITABLE=$FULLMODPATH/../usr/share/kudzu/pcitable
     CACHE=$KERNELROOT/lib/modules/.cache
 
     dieLater=
     for n in $TRIMPCITABLE $PCITABLE $GETMODDEPS $MODINFO $FILTERMODDEPS \
-	     $LANGTABLE; do
+	     $LANGTABLE $SYSLINUX; do
 	if [ ! -f $n ]; then
 	    echo "$n doesn't exist"
 	    dieLater=1
@@ -65,7 +66,7 @@ rundepmod () {
     final=$2
 
     exclpattern="tc90x|FPT|BusLogic|Pci2000|Pci2220i"
-    
+
     depmod -e -i -m $KERNELROOT/boot/System.map-$version \
 	    $what > $final.foo 2>&1 | 
 	    egrep -v "modprobe: (${exclpattern}) multiply defined"
@@ -78,6 +79,13 @@ rundepmod () {
     rm -f $final.foo
 }
 
+getmoddeps () {
+    what=$1
+    final=$2
+
+    egrep $(echo $what | sed 's/\.o  */|^/g;s/\.o$//') $MODDEPS > $final
+}
+
 intcopymodules () {
     for n in $1; do
 	m=$(findmodule $n)
@@ -137,7 +145,7 @@ makemoduleball() {
     $MODLIST --modinfo-file $MODINFO --ignore-missing --modinfo \
 	$MMB_MODULESET > ../$MMB_MODINFO
 
-    rundepmod "*.o" ../modules.dep
+    getmoddeps "*.o" ../modules.dep
 
     # create the pcitable
     $TRIMPCITABLE *.o < $PCITABLE > ../pcitable
@@ -155,6 +163,16 @@ makemoduleball() {
     popd  > /dev/null
 }
 
+makemainmodules() {
+set -x
+    modlist=`expandModuleSet "$1"`
+
+    rm -rf $FULLMODPATH
+
+    makemoduleball $FULLMODPATH "$modlist"
+set +x
+}
+
 makebootdisk() {
     MBD_FILENAME=$IMAGEPATH/$1
     LOADERBIN=$2
@@ -237,7 +255,6 @@ EOF
     if [ $ARCH = "i386" ]; then
 	INITRDSIZE=2000
 	FLOPPYSIZE=1440
-	SYSLINUX=../../trees/syslinux-1.45
     else
 	echo "I don't know how big to make the image!" >&2
 	exit 1
@@ -265,9 +282,9 @@ EOF
     # $MBD_FSIMAGE (the initrd) to it, add a kernel, umount it. It should be
     # left as $MBD_TMPIMAGE, with no side affects.
     if [ $ARCH = "i386" ]; then
-	gunzip < ../../trees/syslinux-1.45/img1440k.gz | 
+	gunzip < $BOOTDISKDIR/template.img.gz |
 	    dd of=$MBD_TMPIMAGE conv=notrunc > /dev/null 2> /dev/null
-	../../trees/syslinux-1.45/syslinux $MBD_TMPIMAGE
+	$SYSLINUX $MBD_TMPIMAGE
 	mkdir -p $MBD_BOOTTREE
 	mount -o loop -t msdos $MBD_TMPIMAGE $MBD_BOOTTREE
 
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index ce80b3918..c862a7ef9 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -1,7 +1,11 @@
 
-makebootdisk boot.img loader-local "+scsi vfat"
-makebootdisk bootnet.img loader-network "+net"
+#makebootdisk boot.img loader-local "+scsi vfat"
+makebootdisk bootnet.img loader-network "3c59x ac3200 at1700 de4x5 
+    de600 de620 depca dgrs eepro eexpress hp-plus hp 
+    hp100 ibmtr ni52 tulip wavelan wd nfs"
 
-makedriverdisk "gdth" "gdth"
+#makedriverdisk "gdth" "gdth"
 #makedriverdisk "eata_dma" "eata_dma"
 #makedriverdisk "paride" "parport_pc parport pcd paride aten bpck comm dstr epat fit2 fit3 friq frpw kbic ktti on20 on26 epia ppa imm"
+
+makemainmodules "+scsi +net vfat"
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 2f5f498e1..05c5c0904 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -15,14 +15,16 @@ if [ $(uname -m) = ia64 ]; then
     STRIP=echo
 fi
 
-LATEST="latest --arch $ARCH"
-
 if [ -z "$1" ]; then
 	echo "upd-instroot: updates instimage from a Red Hat RPMS directory"
-	echo "usage:        $0 <packagedir>"
+	echo "usage:        $0 <packagedir> [<targetdir>]"
 	exit 1
 fi
 
+if [ ! -d $1 ]; then
+	LATEST="latest --arch $ARCH"
+fi
+
 HOMEDIR=`pwd`
 
 # remove all non unused python files
@@ -84,25 +86,34 @@ expandPackageSet() {
 
 PACKAGEDIR=$1
 
-rm -rf /tmp/upd-instroot
 DEST=/tmp/upd-instroot/hd
-mkdir -p $DEST
+if [ -z "$2" ]; then
+    DESTGR=/tmp/upd-instroot/gr
+elif [ -d "$2" ]; then
+    DESTGR=$2/RedHat/instimage
+else
+    echo "$2 is not a directory!"
+    exit 1
+fi
 
-DESTGR=/tmp/upd-instroot/gr
+rm -rf $DEST $DESTGR
+mkdir -p $DEST
 mkdir -p $DESTGR
 
 PACKAGES="glibc ldconfig setup python newt libtermcap zlib ash e2fsprogs
 	  util-linux raidtools locale-ja popt mount procps rpm XFree86
 	  Xconfigurator anaconda anaconda-runtime kudzu-devel kudzu db3
-	  rpm-python"
+	  rpm-python syslinux"
 
 if [ $ARCH = i386 ]; then
     PACKAGES="$PACKAGES kernel-pcmcia-cs"
 fi
 
+# xpm is missing
+
 # Some packages are listed twice, but that's okay
-PACKAGESGR="XFree86-libs XFree86-SVGA imlib libpng libtiff libjpeg
-      XFree86-S3 XFree86-S3V XFree86-Mach32 XFree86-Mach64
+PACKAGESGR="XFree86-libs imlib libpng libtiff libjpeg
+      XFree86-S3 XFree86-S3V 
       XFree86-FBDev XFree86-I128 XFree86-3DLabs XFree86-VGA16
       XFree86-75dpi-fonts XFree86-ISO8859-2-75dpi-fonts glib gtk+
       XFree86-ISO8859-9-75dpi-fonts esound audiofile gnome-libs
@@ -111,7 +122,7 @@ PACKAGESGR="XFree86-libs XFree86-SVGA imlib libpng libtiff libjpeg
       popt specspo util-linux
       rpm rpm-devel open grep net-tools traceroute 
       tar procps textutils sed ncurses bash cpio mt-st iputils sh-utils
-      XFree86-cyrillic-fonts XFree86 xpm Xconfigurator pygnome pygtk
+      XFree86-cyrillic-fonts XFree86 Xconfigurator pygnome pygtk
       pygtk-libglade pygnome-libglade pygnome-applet pygnome-capplet"
 
 if [ $ARCH != ia64 ]; then
@@ -157,6 +168,7 @@ etc/protocols
 etc/services
 usr/bin/python*
 usr/lib/python*
+usr/bin/syslinux
 usr/lib/libnewt*
 lib/libtermcap*
 usr/lib/libz.*