Remove some legacy stuff that's no longer relevant from .discinfo/.treeinfo

2 files changed, 2 insertions, 21 deletions

diff --git a/scripts/buildinstall b/scripts/buildinstall
index 339779cbe..eb5d7fc54 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -138,12 +138,12 @@ echo "Building images..."
 $UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/minstg2 $TREEDIR/stage2 $DIR
 
 echo "Writing .treeinfo file..."
-$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --packagedir=${PKGDIR#$DIR/} --outfile=$DIR/.treeinfo
+$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$DIR/.treeinfo
 
 echo "Making images..."
 $MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $DIR $TREEDIR/minstg2 $TREEDIR/stage2 $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
 
 echo "Writing .discinfo file"
-$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$DIR/.discinfo
+$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL"  --outfile=$DIR/.discinfo
 
 rm -rf $TREEDIR $BUILDINSTDIR
diff --git a/scripts/makestamp.py b/scripts/makestamp.py
index 9d919d026..c3f416c02 100755
--- a/scripts/makestamp.py
+++ b/scripts/makestamp.py
@@ -34,9 +34,6 @@ data = {"timestamp": None,
         "releasestr": None,
         "arch": None,
         "discNum": None,
-        "baseDir": None,
-        "packagesDir": None,
-        "pixmapsDir": None,
         "outfile": None}
 allDiscs = None
 
@@ -77,19 +74,6 @@ if data["discNum"] is None and allDiscs is None:
     print >> sys.stderr, "No disc number specified; assuming disc 1"
     data["discNum"] = "1"
 
-if data["baseDir"] is None:
-    print "Where is the comps file located?"
-    data["baseDir"] = sys.stdin.readline()[:-1]
-
-if data["packagesDir"] is None:
-    print "Where are the packages located?"
-    data["packagesDir"] = sys.stdin.readline()[:-1]
-
-if data["pixmapsDir"] is None:
-    print "Where are the images located?"
-    data["pixmapsDir"] = sys.stdin.readline()[:-1]
-
-
 if data["outfile"] is None:
     f = sys.stdout
 else:
@@ -102,8 +86,5 @@ if allDiscs is None:
     f.write("%s\n" % data["discNum"])
 else:
     f.write("0\n")
-f.write("%s\n" % data["baseDir"])
-f.write("%s\n" % data["packagesDir"])
-f.write("%s\n" % data["pixmapsDir"])