merge taroon branch. mostly package bits, but a lot of other misc stuff

and cleanups in here too

7 files changed, 109 insertions, 346 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index 963810fed..56aa49f6c 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -29,16 +29,14 @@ TOPDIR=$(cd $TOPDIR; pwd)
     INSTIMGPATH=$TOPDESTPATH/RedHat/base
     INSTIMGTEMPLATE=$3
     IMGPATH=$4
-    KERNELROOT=/tmp/updboot.kernel.$$
-    MODDEPS=$KERNELROOT/moddeps
+    KERNELBASE=/tmp/updboot.kernel.$$
+    MODDEPS=$KERNELBASE/moddeps
     BUILDARCH=$5
 
     if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
 	KERNELNAME=vmlinux
-	KERNELARCH=ppc64
     else
 	KERNELNAME=vmlinuz
-	KERNELARCH=$BUILDARCH
     fi
 
     if [ "$BUILDARCH" = "ia64" ]; then
@@ -72,11 +70,11 @@ TOPDIR=$(cd $TOPDIR; pwd)
     rm -rf $IMAGEPATH
     rm -rf $FULLMODPATH
     rm -rf $FINALFULLMODPATH
-    rm -rf $KERNELROOT
+    rm -rf $KERNELBASE
     mkdir -p $IMAGEPATH
     mkdir -p $FULLMODPATH
     mkdir -p $FINALFULLMODPATH
-    mkdir -p $KERNELROOT
+    mkdir -p $KERNELBASE
     mkdir -p $INSTIMGPATH
 
 # Stuff that we need
@@ -92,8 +90,8 @@ TOPDIR=$(cd $TOPDIR; pwd)
     BOOTDISKDIR=$IMGPATH/usr/lib/anaconda-runtime/boot
     LANGTABLE=$IMGPATH/usr/lib/anaconda/lang-table
     PCITABLE=$IMGPATH/usr/share/hwdata/pcitable
-    CACHE=$KERNELROOT/lib/modules/.cache
-    MODULESUSED=$KERNELROOT/modules-used
+    CACHE=$KERNELBASE/.cache
+    MODULESUSED=$KERNELBASE/modules-used
 
     touch $MODULESUSED
 
@@ -227,10 +225,11 @@ intcopymodules () {
 	    echo $n >> $MODULESUSED
 	    for o in $m ; do 
 		echo $n
-		ver=$(echo $o |cut -d / -f 6)
-		if ! [ -d $dir/$ver ] ; then mkdir $dir/$ver ; fi
-		if ! cp $o $dir/$ver; then
-		    echo "Failed to copy $o to $dir/$ver (for module $n)" >&2
+		ver=$(echo $o |cut -d / -f 7)
+		myarch=$(echo $o |cut -d / -f 4)
+		if ! [ -d $dir/$ver/$myarch ] ; then mkdir -p $dir/$ver/$myarch ; fi
+		if ! cp $o $dir/$ver/$myarch; then
+		    echo "Failed to copy $o to $dir/$ver/$myarch (for module $n)" >&2
 		fi
 	    done
         fi
@@ -330,7 +329,7 @@ makemoduleball() {
     $TRIMPCITABLE $(find . -name *.o -exec basename {} \;) < $PCITABLE > ../pcitable
 
     if [ -n "$MMB_DD" ]; then
-	echo $MMB_DD > $MMB_DIR/rhdd-6.1
+	echo $MMB_DD > $MMB_DIR/rhdd
     fi
 
     find . -type f | cpio --quiet -H crc -o | gzip -9 > ../$MMB_NAME
@@ -469,6 +468,9 @@ makeinitrd() {
     root::0:0:root:/:/bin/bash
 EOF
 
+    # set up the arch bits
+    echo $arch > $MBD_DIR/etc/arch
+
     install -s -m 755 $LOADERBINDIR/$LOADERBIN $MBD_DIR/sbin/loader
     install -s -m 755 $LOADERBINDIR/$INITBIN $MBD_DIR/sbin
     if [ "$BUILDARCH" != "s390" -a "$BUILDARCH" != "s390x" ]; then
@@ -856,13 +858,14 @@ fi
 
 # Find the kernel, unpack it, and verify it
 vertag="BOOT"
-if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
-    vertag="dummyvar tape"
-fi
 if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
-    vertag="pseries iseries"
+    arches="ppc64pseries ppc64iseries"
+else
+    arches="$BUILDARCH"
 fi
-for kernelvers in $vertag; do
+for KERNELARCH in $arches; do
+  for kernelvers in $vertag; do
+    KERNELROOT=$KERNELBASE/$KERNELARCH
     kpackage=$($LATEST $KERNELPATH kernel-$kernelvers)
     mkdir -p $KERNELROOT/lib/modules/misc
     if [ ! -f "$kpackage" ]; then
@@ -877,7 +880,8 @@ for kernelvers in $vertag; do
     fi
 
     version=$(rpm --qf '%{VERSION}-%{RELEASE}' -qp $kpackage)${kernelvers}
-    echo "unpacking $kpackage"
+    arch=$(rpm --qf '%{ARCH}\n' -qp $kpackage)
+    echo "unpacking $kpackage.$arch"
 
     rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd)
     if [ ! -z $ppackage ]; then 
@@ -912,10 +916,11 @@ for kernelvers in $vertag; do
 
     # make the boot images
     makeBootImages
+  done
 done
 
 # make the second stage
-find $KERNELROOT/lib/modules/ > $CACHE
+find $KERNELBASE/*/lib/modules/ > $CACHE
 makeSecondStage
-rm -rf $KERNELROOT
+rm -rf $KERNELBASE
 
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 90a6738dc..3ee2170ce 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -2,7 +2,8 @@
 USBMODS="usb-uhci usb-ohci hid keybdev"
 LATEUSBMODS="mousedev"
 
-COMMONMODULES="nfs fat vfat cramfs floppy"
+BTERMMODULES="vga16fb"
+COMMONMODULES="nfs fat vfat cramfs loop floppy $BTERMMODULES"
 SECSTAGE="nfs fat vfat raid0 raid1 raid5 lvm-mod ext3 $LATEUSBMODS"
 NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin tg3"
 SCSIMODULES="sd_mod sr_mod scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2200 qla2300 sym53c8xx sym53c8xx_2 mptscsih mptbase ips"
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index 9ba290b72..bdd2a84d6 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -21,7 +21,7 @@ prepareBootImage() {
 makeBootImages() {
     echo "Building boot images for kernel $kernelvers"
 
-    if [ "$kernelvers" = "pseries" ]; then
+    if [ "$KERNELARCH" = "ppc64pseries" ]; then
 	echo "Building pSeries initrd"
 	makeinitrd --initrdto $TOPDESTPATH/ppc/chrp/ramdisk.image.gz \
 	    --initrdsize 8192 \
@@ -29,7 +29,7 @@ makeBootImages() {
 	    --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $SCSIMODS $IDEMODS $ISOMODULES"
 
 	mkdir -p $TOPDESTPATH/etc $TOPDESTPATH/ppc/chrp
-	cp $KERNELROOT/boot/vmlinux-*pseries* $TOPDESTPATH/ppc/chrp/vmlinux
+	cp $KERNELROOT/boot/vmlinux-* $TOPDESTPATH/ppc/chrp/vmlinux
 	cp $BOOTDISKDIR/yaboot.conf $TOPDESTPATH/etc/yaboot.conf
 	cp $BOOTDISKDIR/bootinfo.txt $TOPDESTPATH/ppc/bootinfo.txt
 	cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/chrp
@@ -45,7 +45,7 @@ makeBootImages() {
 	cp $TOPDESTPATH/boot_image $TOPDESTPATH/isopath/boot_image
 	mkisofs -generic-boot $TOPDESTPATH/isopath/boot_image -A "$PRODUCT $VERSION" -V "PBOOT" -J -R -v -T -allow-multidot -l -o $TOPDESTPATH/images/boot.iso $TOPDESTPATH/isopath
 	rm -rf $TOPDESTPATH/isopath/
-    elif [ "$kernelvers" = "iseries" ]; then
+    elif [ "$KERNELARCH" = "ppc64iseries" ]; then
 	mkdir -p $TOPDESTPATH/ppc/iSeries
 
 	echo "Building iSeries initrd"
@@ -54,12 +54,14 @@ makeBootImages() {
 	    --loaderbin loader \
 	    --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $IDEMODS $ISOMODULES $ISERIESMODULES"
 
-	cp $KERNELROOT/boot/vmlinux-*iseries* $TOPDESTPATH/ppc/iSeries/vmlinux
-	cp $KERNELROOT/boot/System.map-*iseries* $TOPDESTPATH/ppc/iSeries/System.map
-	
-	$IMGPATH/usr/sbin/addRamDisk $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz $TOPDESTPATH/ppc/iSeries/System.map $TOPDESTPATH/ppc/iSeries/vmlinux $TOPDESTPATH/ppc/iSeries/boot.img
+	cp $KERNELROOT/boot/vmlinux-* $TOPDESTPATH/ppc/iSeries/vmlinux
+	cp $KERNELROOT/boot/System.map-* $TOPDESTPATH/ppc/iSeries/System.map
+
+	$IMGPATH/usr/sbin/addSystemMap $TOPDESTPATH/ppc/iSeries/System.map $TOPDESTPATH/ppc/iSeries/vmlinux $TOPDESTPATH/ppc/iSeries/vmlinux.sm
+	$IMGPATH/usr/sbin/addRamDisk $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz $TOPDESTPATH/ppc/iSeries/System.map $TOPDESTPATH/ppc/iSeries/vmlinux.sm $TOPDESTPATH/ppc/iSeries/boot.img
+	rm -f $TOPDESTPATH/ppc/iSeries/vmlinux.sm
     else
-	echo "Unknown kernel version: $kernelvers"
+	echo "Unknown kernel arch: $KERNELARCH"
     # mac?
     # echo "Building Mac initrd"
     # makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.image.gz \
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 821447a96..e428d4284 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -159,6 +159,9 @@ EOF
     cp -f $IMGPATH/usr/bin/login $MBD_DIR/sbin/login
     cp -f $IMGPATH/usr/sbin/sshd $MBD_DIR/sbin/sshd
 
+    # set up the arch bits
+    echo $arch > $MBD_DIR/etc/arch
+
     install -s -m 755 $LOADERBINDIR/$LOADERBIN $MBD_DIR/sbin/loader
     install -s -m 755 $LOADERBINDIR/shutdown $MBD_DIR/sbin/shutdown
     #install -s -m 755 $LOADERBINDIR/load_anaconda $MBD_DIR/sbin/loader
@@ -434,25 +437,14 @@ SECSTAGE="$IDEMODS $SCSIMODS raid0 raid1 raid5 lvm-mod"
 
 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 ipv6"
+NETWORKMODULES="$COMMONMODULES nfs ctc netiucv ipv6 lcs"
 
 makeBootImages() {
-    echo "In mk-images.s390: kernelvers is $kernelvers"
-    if [ "$kernelvers" = "" ]; then
 	makeS390initrd --initrdto $TOPDESTPATH/images/initrd.img \
 	    --initrdsize 15000 \
 	    --loaderbin loader \
 	    --modules "$NETWORKMODULES"
 	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
-    fi
-
-    if [ "$kernelvers" = "tape" ]; then
-	makeS390initrd --initrdto $TOPDESTPATH/images/tapeinrd.img \
-	    --initrdsize 15000 \
-	    --loaderbin loader \
-	    --modules "$NETWORKMODULES"
-	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/tapekrnl.img
-    fi
 }
 
 makeSecondStage() {
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 91cb0cd5a..a7f77dbfa 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -20,6 +20,7 @@ log.handler = anaconda_log
 rpmFD = None
 
 import hdrlist
+import rhpl.arch
 
 def cmpHeaderByName(h1, h2):
     n1 = string.lower(h1.nevra())
@@ -32,19 +33,35 @@ def cmpHeaderByName(h1, h2):
 
     return 1
 
-# returns 1 if comp is in the parent chain for subcomp
-def isParent(comp, subcomp):
-    if not subcomp:
-        return 0
-    if subcomp.parent == comp:
-        return 1
-    return isParent(comp, comp.parent)
-
-# turns on a whole comp chain
-def selectComp(comp):
-    comp.select()
-    if comp.parent:
-        selectComp(comp.parent)
+def addIfNeeded(pkg):
+    global pkgOrder, pkgHash
+    canon = rhpl.arch.canonArch
+    second = rhpl.arch.getSecondaryArch()
+    diff = rhpl.arch.archDifference
+    if not pkgHash.has_key (pkg.name):
+        pkgHash[pkg.name] = [ pkg ]
+        pkgOrder.append(pkg.nevra())
+    elif second is None:
+        # this isn't a biarch arch, so we don't need to worry about
+        # multiple glibcs
+        return
+    else:
+        # this is a biarch arch.  we want to just have a primary package
+        # for each here
+        for p in pkgHash[pkg.name]:
+            arch1 = p['arch']
+            arch2 = pkg['arch']
+            # same arch, don't worry about it
+            if arch1 == arch2:
+                continue
+            # if one of them doesn't work for the canon arch and the other
+            # does, then one of them is for the secondary arch and we want
+            # to add it.  
+            if ( ((diff(canon, arch1) == 0) and (diff(second, arch2) != 0)) or
+                 ((diff(canon, arch2) == 0) and (diff(second, arch1) != 0)) ):
+                pkgHash[pkg.name].append(pkg)
+                pkgOrder.append(pkg.nevra())
+        
 
 # set PKGORDER_DEBUG to get rpm debugging
 if os.environ.has_key("PKGORDER_DEBUG"):
@@ -75,7 +92,9 @@ except rpm.error:
     sys.exit(1)
 # and read the comps file
 grpset = hdrlist.groupSetFromCompsFile("file://%s/RedHat/base/comps.xml"
-                                       %(distDir,), hdlist)
+                                       %(distDir,), hdlist, doSelect = 0)
+grpset.unselectAll()
+#grpset.groups["everything"].select()
 
 # work out the order we'd like to install everything in
 pkgOrder = []
@@ -87,9 +106,13 @@ for package in hdlist.keys():
         not package.startswith("kernel-doc") and
         not package.startswith("kernel-source") and
         not package.startswith("kernel-debug")):
-        hdlist[package].select()
+        try:
+            hdlist[package].select()
+        except:
+            print package
+            print type(package)
         pkgOrder.append(hdlist[package].nevra())
-        pkgHash[hdlist[package].name] = None
+        pkgHash[hdlist[package].name] = [ hdlist[package] ]
 
 # Tier 1 language packages get priority.
 tier1langs = ("en:en_US:de:de_DE:es:es_ES:fr:fr_FR:it:it_IT:ja:ja_JP:"
@@ -121,6 +144,8 @@ latelangs = []
 for id in grpids:
     if id in complist:
         continue
+    if id == "everything": #this would be silly
+        continue
     if ((grpset.groups[id].langonly is not None) and
         (tier1langs.find(grpset.groups[id].langonly) == -1)):
         latelangs.append(id)
@@ -136,6 +161,7 @@ for id in complist:
     group = grpset.groups[id]
     list = []
 
+    grpset.unselectAll()
     group.select()
 
     # append what got turned on to our order.
@@ -144,9 +170,7 @@ for id in complist:
             list.append(p)
     list.sort(cmpHeaderByName)
     for item in list:
-        if not pkgHash.has_key (item.name):
-            pkgOrder.append(item.nevra())
-            pkgHash[item.name] = None
+        addIfNeeded(item)
 
 # add all of the packages that haven't been added yet.
 list = []
@@ -163,9 +187,11 @@ os.system ("mkdir -p " + testpath + "/var/lib/rpm")
 
 ts = rpm.TransactionSet(testpath)
 ts.setVSFlags(~(rpm.RPMVSF_NORSA|rpm.RPMVSF_NODSA))
-ts.setFlags(rpm.RPMTRANS_FLAG_NOMD5|rpm.RPMTRANS_FLAG_ANACONDA)
+ts.setFlags(rpm.RPMTRANS_FLAG_ANACONDA)
+i = 0
 for h in pkgOrder:
-    #print "in:", h[1000000]
+#    sys.stderr.write("%s: %s\n" %(i, h))
+    i += 1
     ts.addInstall(hdlist[h].hdr, hdlist[h].hdr, 'i')
 pkgOrder = []
 
@@ -181,7 +207,25 @@ except AttributeError:
     print "you don't have the latest RPM!"
     sys.exit(1)
 
+outputted = []
 # print the results.
 for p in pkgOrder:
-    print "%s-%s-%s" % (p['name'], p['version'], p['release'])
+    def archSort(hdr1, hdr2):
+        h1 = hdlist[hdr1[0]]
+        h2 = hdlist[hdr2[0]]
+        
+        if rhpl.arch.score(h1['arch']) > rhpl.arch.score(h2['arch']):
+            return -1
+        elif rhpl.arch.score(h1['arch']) < rhpl.arch.score(h2['arch']):
+            return 1
+        return 0
+    
+    if p['name'] in outputted:
+        continue
+    pkgs = hdlist.pkgnames[p['name']]
+    pkgs.sort(archSort)
+    for pnevra in pkgs:
+        pkg = hdlist.pkgs[pnevra[0]]
+        print "%s-%s-%s.%s" % (pkg['name'], pkg['version'],
+                               pkg['release'], pkg['arch'])
 
diff --git a/scripts/splitdistro b/scripts/splitdistro
deleted file mode 100755
index 14a9f60b5..000000000
--- a/scripts/splitdistro
+++ /dev/null
@@ -1,282 +0,0 @@
-#!/usr/bin/python2.2
-
-# These dirs, along with RPMS, make up disc 2
-disc2dirs = [ "preview" ]
-
-# These files appear on all binary CDs
-jointfiles = [ "beta_eula.txt", "RPM-GPG-KEY", "README", "GPL", "EULA"] 
-
-targetSize = 648 * 1024.0 * 1024.0
-
-# Leave about 1.2MB of space on the disc
-fudgeFactor = 1.2 * 1024 * 1024
-
-# rough estimate of the size of the comps package -- we don't create it
-# until after we run splitdistro but need to leave room for it on CD1
-compsSize = 10.0 * 1024 * 1024
-
-#-----------------
-
-import sys
-import os
-import os.path
-import string
-import getopt
-import time
-import types
-
-def stamp(path, releasestr, num, arch, startedAt, dirInfo):
-    try:
-        os.unlink("%s/.discinfo" % path)
-    except:
-        pass
-    f = open("%s/.discinfo" % path, "w")
-    f.write("%f\n" % startedAt)
-    f.write("%s\n" % releasestr)
-    f.write("%s\n" % arch)
-    f.write("%s\n" % num)
-    if dirInfo is not None:
-        for item in dirInfo:
-            f.write("%s\n" % item)
-    f.close()
-
-def moveFiles(srcDir, destDir, files):
-    for fn in files:
-	src = "%s/%s" % (srcDir, fn)
-	dest = "%s/%s" % (destDir, fn)
-	try:
-		os.rename(src, dest)
-	except:
-		print "in moveFiles, src was %s, dest was %s" % (src, dest)
-		raise RuntimeError
-
-def linkFile(srcDir, destDir, file):
-    for file in jointfiles:
-        src = "%s/%s" % (srcDir, file)
-        dest = "%s/%s" %(destDir, file)
-        try:
-            os.link(src, dest)
-        except OSError, (errno, msg):
-            pass
-#            print "**** WARNING linking %s to %s: %s" % (src, dest, msg)
-
-def excessFiles(path, fileList, maxSize):
-    total = 0
-    moveList = []
-    found = 0
-
-    for fns in fileList:
-	if type(fns) == types.StringType:
-	    fns = [ fns ]
-
-	size = 0
-	for fn in fns:
-	    thisSize = os.path.getsize(path + "/" + fn)
-	    size = size + thisSize + ((thisSize + 2047) % 2048)
-
-	if size + total  < maxSize:
-	    total = total + size
-	else:
-	    # once we're done, we're done
-            if found == 0:
-#                print "straw was %s" % (fns,)
-                found = 1
-	    total = maxSize
-	    moveList.extend(fns)
-
-    return moveList
-
-class DirectoryIterator:
-    def __init__(self):
-        self.inodes = {}
-    
-    def traverse (self, arg, dirname, names):
-        for name in names:
-            sb = os.lstat (dirname + "/" + name)
-            if not self.inodes.has_key(sb[1]):
-                self.inodes[sb[1]] = sb[6]
-
-    def total(self):
-        total = 0
-        for size in self.inodes.values():
-            total = total + size
-	return total
-
-def spaceUsed(path):
-    foo = DirectoryIterator()
-    os.path.walk (path, foo.traverse, None)
-    return foo.total()
-
-fns = {}
-
-(args, extra) = getopt.getopt(sys.argv[1:], '', [ 'fileorder=', 'release=' ])
-
-if len(extra) != 2:
-    print "splitdistro --fileorder <file> [--release <comment>] <toppath> <arch>"
-    sys.exit(1)
-
-releasestr = ""
-packageOrderFile = None
-for n in args:
-    (str, arg) = n
-    if str == '--fileorder':
-	packageOrderFile = arg
-    if str == '--release':
-	releasestr = arg
-
-if not packageOrderFile:
-    print "splitdistro --fileorder <file> [--release <comment>] <toppath> <arch>"
-    sys.exit(1)
-
-
-arch = extra[1]
-distDir = os.path.normpath(extra[0] + "/" + arch)
-srcDir = os.path.normpath(extra[0] + "/" + arch + "/SRPMS")
-
-if not os.access("%s/.discinfo" %(distDir,), os.O_RDONLY):
-    startedAt = time.time()
-    dirInfo = None
-else:
-    f = open("%s/.discinfo" %(distDir,), "r")
-    startedAt = string.atof(f.readline()[:-1])
-    releasestr = f.readline()[:-1]
-    newarch = f.readline()[:-1]
-    if newarch != arch:
-        raise RuntimeError, "Passed arch doesn't match arch in .discinfo file"
-    # throw out discnum
-    f.readline()
-    # basedir, packagedir, and pixmapdir
-    dirInfo = [ f.readline()[:-1], f.readline()[:-1], f.readline()[:-1] ]
-
-if not os.path.isdir(distDir):
-    print "error: %s is not a directory" % distDir
-    sys.exit(1)
-
-if not os.path.isdir(srcDir):
-    print "error: %s is not a directory" % srcDir
-    sys.exit(1)
-
-disc1Dir = distDir + "-disc1"
-disc2Dir = distDir + "-disc2"
-disc3Dir = distDir + "-disc3"
-disc1SrcDir = distDir + "-disc4"
-disc2SrcDir = distDir + "-disc5"
-disc3SrcDir = distDir + "-disc6"
-
-id = 0
-
-files = os.listdir(distDir + "/RedHat/RPMS")
-files.sort()
-packages = {}
-for file in files:
-    l = string.split(file, ".")
-    pkg = string.join(l[:-2], ".")
-    if packages.has_key(pkg):
-	packages[pkg].append(file)
-    else:
-	packages[pkg] = [ file ]
-
-f = open(packageOrderFile, "r")
-binPkgList = []
-for pkg in f.readlines():
-    # chop
-    pkg = pkg[:len(pkg) - 1]
-    if pkg[0:8] != "warning:":
-	binPkgList.append(packages[pkg])
-
-del f
-
-print "Splitting tree..."
-
-totalsize = spaceUsed(distDir)
-rpmsize = spaceUsed(distDir + "/RedHat/RPMS")
-dirsize = 0
-for dir in disc2dirs:
-    what = distDir + "/" + dir
-    if os.access(what, os.R_OK):
-        dirsize = dirsize + spaceUsed(distDir + "/" + dir)
-srpmsize = spaceUsed(distDir + "/SRPMS")
-
-disc1used = totalsize - rpmsize - dirsize - srpmsize
-
-os.system("rm -rf %s %s %s %s" % ( disc1Dir, disc2Dir, disc1SrcDir,
-				   disc2SrcDir))
-os.system("mkdir -p %s %s/SRPMS %s/SRPMS %s/RedHat/RPMS %s/RedHat/RPMS %s/SRPMS" % 
-	    (disc1Dir, disc1SrcDir, disc2SrcDir, disc2Dir, 
-             disc3Dir, disc3SrcDir))
-
-print "Creating disc1..."
-
-os.system("cp -al %s/. %s" % (distDir, disc1Dir))
-stamp(disc1Dir, releasestr, "1", arch, startedAt, dirInfo)
-
-# remove the srpms dir from disc1 since it shouldn't be there
-os.system("rm -rf %s/SRPMS" % (disc1Dir,))
-
-print "Creating disc2..."
-stamp(disc2Dir, releasestr, "2", arch, startedAt, dirInfo)
-
-for file in jointfiles:
-    linkFile(disc1Dir, disc2Dir, file)
-
-print targetSize / (1024.0 * 1024.0)
-print disc1used / (1024.0 * 1024.0)
-print fudgeFactor / (1024.0 * 1024.0)
-print compsSize / (1024.0 * 1024.0)
-print (targetSize - disc1used - fudgeFactor - compsSize) / (1024.0 * 1024.0)
-disc2pkgs = excessFiles(distDir + "/RedHat/RPMS", binPkgList, 
-			targetSize - disc1used - fudgeFactor - compsSize)
-print "first to move to disc2 is", disc2pkgs[0]
-moveFiles("%s/RedHat/RPMS" % disc1Dir, 
-	  "%s/RedHat/RPMS" % disc2Dir, 
-	  disc2pkgs);
-disc1Size = spaceUsed(disc1Dir)
-
-print "Creating disc3..."
-stamp(disc3Dir, releasestr, "3", arch, startedAt, dirInfo)
-
-for file in jointfiles:
-    linkFile(disc1Dir, disc2Dir, file)
-
-disc3pkgs = excessFiles(distDir + "/RedHat/RPMS", binPkgList, 
-			targetSize + disc1Size - disc1used - fudgeFactor)
-
-print "first to move to disc3 is", disc3pkgs[0]
-moveFiles("%s/RedHat/RPMS" % disc2Dir, 
-	  "%s/RedHat/RPMS" % disc3Dir, 
-	  disc3pkgs);
-disc3used = spaceUsed(disc3Dir)
-
-print "Creating first source disc..."
-stamp(disc1SrcDir, releasestr, "4", arch, startedAt, dirInfo)
-os.system("cp -al %s %s" % (srcDir, disc1SrcDir))
-
-print "Creating second source disc..."
-stamp(disc2SrcDir, releasestr, "5", arch, startedAt, dirInfo)
-
-srcPkgList = os.listdir("%s/SRPMS" % disc1SrcDir)
-srcPkgList.sort()
-#srcPkgList.reverse()
-disc2pkgs = excessFiles(srcDir, srcPkgList,
-			targetSize - fudgeFactor)
-print "first src pkg to move to 2nd src cd is", disc2pkgs[0]
-moveFiles("%s/SRPMS" % disc1SrcDir, 
-	  "%s/SRPMS" % disc2SrcDir, 
-	  disc2pkgs);
-srcDisc1Size = spaceUsed(disc1SrcDir)
-
-print "Dropping remainder of sources on third disc..."
-stamp(disc3SrcDir, releasestr, "6", arch, startedAt, dirInfo)
-disc3pkgs = excessFiles(srcDir, srcPkgList,
-                        srcDisc1Size + targetSize - fudgeFactor)
-print "first src pkg to move to 3rd src cd is", disc3pkgs[0]
-moveFiles("%s/SRPMS" % disc2SrcDir,
-          "%s/SRPMS" % disc3SrcDir,
-          disc3pkgs)
-
-#sys.exit(0)
-
-sys.stdout.flush()
-
-os.system("du -sh %s %s %s %s %s %s" % (disc1Dir, disc2Dir, disc3Dir,
-                                        disc1SrcDir, disc2SrcDir, disc3SrcDir))
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 47cac4124..10c280eec 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -484,6 +484,7 @@ $LIBDIR/libnss_dns*
 $LIBDIR/libpam*
 $LIBDIR/libproc*
 sbin/addRamDisk
+sbin/addSystemMap
 sbin/debugfs
 sbin/e2fsck
 sbin/e2label