Merge ~mwhudson/debian-cd/+git/ubuntu:remove-more-stuff into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Michael Hudson-Doyle]

remove the scripts from tools that are clearly no longer used and a couple of other things.

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

Ah thanks for the clarification, I didn't put two and two together that this was for the generic server installer images on riscv64.

review: Approve

[Steve Langasek (vorlon)]

do you mind rebasing this now that your other branches have landed?

[Michael Hudson-Doyle (mwhudson)]

> do you mind rebasing this now that your other branches have landed?

done

diff --git a/CONF.sh b/CONF.sh
index b15a95a..b005f88 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -298,7 +298,6 @@ export NORECOMMENDS=1
 export NOSUGGESTS=1
 
 # Image format:
-# vfat = Output an image in VFAT format (.img)
 # iso  = Output an image in ISO 9660 format (.iso)
 # img  = Output a raw partitioned disk image (.img)
 if [ -z "$IMAGE_FORMAT" ]; then
diff --git a/Makefile b/Makefile
index 74d82a0..b4888ad 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,6 @@ fastsums=$(BASEDIR)/tools/fast_sums
 add_live_filesystem=$(BASEDIR)/tools/add_live_filesystem
 add_winfoss=$(BASEDIR)/tools/add_winfoss
 verbose=$(BASEDIR)/tools/verbose_command
-make_vfat_img=$(BASEDIR)/tools/make-vfat-img
 make_raw_img=$(BASEDIR)/tools/make-raw-img
 hardlink=$(BASEDIR)/tools/hardlink
 
@@ -119,14 +118,9 @@ SDIR=$(TDIR)/$(CODENAME)-src
 
 FIRSTDISKS=CD1 
 
-# we don't know how to generate ISOs for arm; force vfat images
-ifneq (,$(findstring $(ARCH),armel armhf))
-IMAGE_FORMAT := vfat
-else
- # also, riscv64 images are raw images (non-ISO)
- ifeq ($(ARCH),riscv64)
-  IMAGE_FORMAT := img
- endif
+# riscv64 images are raw images (non-ISO)
+ifeq ($(ARCH),riscv64)
+ IMAGE_FORMAT := img
 endif
 
 # CDBASE = $(CODENAME)-$(FULLARCH)-$(1)
@@ -662,13 +656,7 @@ bin-images: ok bin-md5list $(OUT)
 	opts=`cat $(BDIR)/1.mkisofs_opts`; \
 	volid=`cat $(BDIR)/1.volid`; \
 	rm -f $(OUT)/$(CDBASE).raw; \
-	if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
-		if [ -d boot1/ ]; then \
-			cp -a boot1/* CD1; \
-		fi; \
-		$(make_vfat_img) -d CD1 \
-		 -o $(OUT)/$(CDBASE).raw; \
-	elif [ "$(IMAGE_FORMAT)" = "img" ]; then \
+	if [ "$(IMAGE_FORMAT)" = "img" ]; then \
 		$(make_raw_img) -g cd-boot-images/ \
 		 -d CD1 -o $(OUT)/$(CDBASE).raw; \
 	elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
@@ -732,10 +720,7 @@ src-images: ok src-md5list $(OUT)
 pi-makelist:
 	$(Q)set -e; \
 	 cd $(OUT); for file in `find * -name \*.raw`; do \
-	     if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
-	         $(BASEDIR)/tools/pi-makelist-vfat \
-	             $$file > $${file%%.raw}.list; \
-	     elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
+	     if [ "$(IMAGE_FORMAT)" = "iso" ]; then \
 	         $(BASEDIR)/tools/pi-makelist \
 	             $$file > $${file%%.raw}.list; \
 	     fi \
diff --git a/README b/README
index eb3656d..8513768 100644
--- a/README
+++ b/README
@@ -51,8 +51,8 @@ $ make official_images
   $ make bin-official_images ]
 
 However, you really should consider reading further for more information.
-You can also take a look at build.sh and build_all.sh for an automatized
-way of building CD images. 
+You can also take a look at build_all.sh for an automatized way of building
+CD images.
 
 How to build a CD set - step by step
 ====================================
@@ -228,8 +228,8 @@ servers.
 The default configuration shipped with this package will automatically
 name the images "Unofficial". CD will work exactly in the same way
 with all Debian tools, only the label is different. That means you
-can use build.sh and build_all.sh to build your "Unofficial" images
-without modifying anything.
+can use build_all.sh to build your "Unofficial" images without modifying
+anything.
 
 
 Local packages
@@ -258,10 +258,10 @@ Additional targets
 Image format
 ------------
 
-You may want to generate images in ISO 9660 or VFAT formats.
+You may want to generate images in ISO 9660 or raw formats.
 
 Set the IMAGE_FORMAT variable in CONF.sh.  You can choose "iso" for generation
-of .iso (default), or "vfat" for generation of .img.
+of .iso (default), or "img" for generation of raw images.
 
 
 About the symlink farm
diff --git a/README.devel b/README.devel
deleted file mode 100644
index f3c4731..0000000
--- a/README.devel
+++ /dev/null
@@ -1,81 +0,0 @@
-README for those who want to hack on yacs/debian-cd
----------------------------------------------------
-
-Organisation :
---------------
-
-The main source is in the Debian CVS. If you want to hack on debian-cd
-and if you want to send me patches, please work on the latest version
-available in the CVS.
-
-http://cvs.debian.org/debian-cd/
-
-$ cvs -d :pserver:[e-mail]:/cvs/debian-boot co debian-cd
-
-If you want to discuss anything related to the debian-cd development, you
-can contact me directly or, better, you can mail the
[e-mail] mailing list where all people interested in the
-debian-cd development are subscribed.
-
-Technical details :
--------------------
-
-The Makefile which is the main directory will be used to launch
-each step of the install process. Try to comment each target of
-the makefile so that other can know why it's here. If you need
-specific programs (perl or shell scripts), please put them
-in the tools directory.
-
-The tasks directory will contain files listing packages (the
-order in which package are listed is important, each package
-added will be added to the current CD until it's full).
-
-The data dir will contains useful data (not directly task 
-related) like the master file from boot-floppies and so on.
-
-Each tool is self-documented, if you want to know what it
-does read the sources (they are scripts).
-
-Debugging YACS :
-----------------
-
-If you want to read more about what YACS is doing you can set
-the VERBOSE environment variable to 1, 2 or 3 depending on the
-level of noise that you want.
-
-Some scripts generates their own log files in the temp dir. You 
-can take a look at them if you want to check for warnings 
-and so on.
-Log files :
-- $TDIR/$CODENAME-$ARCH/log.list2cds
-- $TDIR/$CODENAME-SRC/log.cds2src
-
-TODO list :
------------
-+ put the doc directory only on the first binary CD
-+ a way to force the inclusion of packages (even broken)
-+ possibility to add project/* to the last CD
-+ check the source files on the mirror (with Sources.gz)
-  when doing make mirrorcheck
-
-Bugs / Problems :
------------------
-* make list will not add contrib packages if you do not
-  select NONFREE too. That's because contrib is broken
-  without non-free. And the building process only allow
-  functional packages to be added.
-
-Technical choices :
--------------------
-
-For the multiboot on the first CD of an i386 CD set, we had two options
-isolinux and el-torito native multiboot. We selected isolinux
-because it works well and it lets you display information to the user.
-The el-torito multiboot just displays a menu with each item
-being the same "2.88Mb boot image". Both multiboot mechanism may
-not work on older hardware with very old BIOSes however the el-torito
-one works a bit better because it's usually able to boot the first choice
-without displaying the menu then. This is a non-issue since people
-may still boot on CD 2,3,4,5 with the usual boot method if the multiboot
-doesn't work.
-
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 8bb22c0..0000000
--- a/build.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh -e
-
-# Script to build one arch
-
-if [ -z "$CF" ] ; then
-    CF=./CONF.sh
-fi
-. $CF
-
-if [ -z "$COMPLETE" ] ; then
-    export COMPLETE=1
-fi
-
-if [ -n "$1" ] ; then
-    FULLARCH="$1"
-    export ARCH="${FULLARCH%%+*}"
-    if [ "$ARCH" = "$FULLARCH" ]; then
-        export SUBARCH=
-    else
-        export SUBARCH="${FULLARCH#*+}"
-    fi
-fi
-
-make distclean
-make ${CODENAME}_status
-echo " ... WARNING: skipping mirror check"
-echo " ... selecting packages to include"
-if [ -f $BASEDIR/tools/boot/$DI_CODENAME/boot-$FULLARCH.calc ]; then
-    . $BASEDIR/tools/boot/$DI_CODENAME/boot-$FULLARCH.calc
-fi
-SIZE_ARGS=''
-for CD in 1; do
-	size=`eval echo '$'"BOOT_SIZE_${CD}"`
-	[ "$size" = "" ] && size=0
-	mult=`eval echo '$'"SIZE_MULT_${CD}"`
-	[ "$mult" = "" ] && mult=100
-    FULL_SIZE=`echo "($DEFBINSIZE - $size) * 1024 * 1024" | bc`
-	echo "INFO: Reserving $size MB on CD $CD for boot files.  SIZELIMIT=$FULL_SIZE."
-    if [ $mult != 100 ]; then
-        echo "  INFO: Reserving "$((100-$mult))"% of the CD for extra metadata"
-        FULL_SIZE=`echo "$FULL_SIZE * $mult" / 100 | bc`
-        echo "  INFO: SIZELIMIT now $FULL_SIZE."
-    fi
-	SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$FULL_SIZE"
-done
-
-FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc`
-make bin-list $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
-echo " ... building the images"
-export OUT="$OUT/$FULLARCH"
-mkdir -p "$OUT"
-if [ -z "$IMAGETARGET" ] ; then
-    IMAGETARGET="bin-official_images"
-fi
-make $IMAGETARGET $SIZE_ARGS SRCSIZELIMIT=$FULL_SIZE
-
-make imagesums
-make pi-makelist
diff --git a/build_all.sh b/build_all.sh
index c9561b2..89589a0 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -36,9 +36,6 @@ do
 	make ${CODENAME}_status
 
 	echo " ... selecting packages to include"
-	if [ -f $BASEDIR/tools/boot/$CODENAME/boot-$FULLARCH.calc ]; then
-	    . $BASEDIR/tools/boot/$CODENAME/boot-$FULLARCH.calc
-	fi
 	SIZE_ARGS=''
 	for CD in 1; do
 		size=`eval echo '$'"BOOT_SIZE_${CD}"`
diff --git a/tools/calc b/tools/calc
deleted file mode 100755
index ff22461..0000000
--- a/tools/calc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# This script tries to get good estimations into the .calc files at
-# boot/$CODENAME/boot-$FULLARCH.calc, so you can use it whenever you want to
-# update these .calc files with more recent estimations.
-
-# It uses info taken from the temporary dir of a previous build for $FULLARCH,
-# $CODENAME. This doesn't need to be a full build, you can get the needed
-# stuff by running a build.sh with something like:
-# IMAGETARGET="ok bootable upgrade bin-infos bin-list"
-
-# Temporary directory of the previous build.
-BDIR="$TDIR/$CODENAME-$FULLARCH"
-
-#Get info from older build if it exists
-if [ -d "$BDIR" ];
-then
-  echo Estimated sizes:
-  rm -f "boot/$CODENAME/boot-$FULLARCH.calc"
-  for i in `du -sm "$BDIR"/CD[0123456789]* |
-              sed -n 's/^\([0-9]\+\).*CD\([0-9]\+\)/\2=\1/p'`
-  do
-    #space used by boot images in megs (this has an error of up to a mega)
-    if [ -d "$BDIR/boot${i%=*}" ]
-    then
-      imgdu=`du -sm "$BDIR/boot${i%=*}" |
-               sed -n 's/^\([0-9]\+\).*/\1/p'`
-    else
-      imgdu=1
-    fi
-    #add it all up and write it to the .calc file
-    echo BOOT_SIZE_${i%=*}=${i#*=}+$imgdu
-    echo BOOT_SIZE_${i%=*}=$((${i#*=}+$imgdu)) >> "boot/$CODENAME/boot-$FULLARCH.calc"
-    case "$FULLARCH" in
-      m68k)	echo SIZE_MULT_${i%=*}=97 >> "boot/$CODENAME/boot-$FULLARCH.calc";;
-    esac
-  done
-fi
-
-#Use different corrections depending on the size of the ISO
-if [ -n "$SIZELIMIT1" ] && [ "$SIZELIMIT1" -gt 1000000000 ] || 
-   [ -n "$SIZELIMIT" ] && [ "$SIZELIMIT" -gt 1000000000 ] ||
-   [ -n "$DEFBINSIZE" ] && [ "$DEFBINSIZE" -gt 1000 ]
-then
-  case "$FULLARCH" in
-    powerpc)     echo SIZE_MULT_1=92 >> "boot/$CODENAME/boot-$FULLARCH.calc";;
-  esac
-else
-  case "$FULLARCH" in
-    powerpc)     echo SIZE_MULT_1=96 >> "boot/$CODENAME/boot-$FULLARCH.calc";;
-  esac
-fi
diff --git a/tools/get_diskusage.pl b/tools/get_diskusage.pl
deleted file mode 100755
index cf02a5c..0000000
--- a/tools/get_diskusage.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Author: Petter Reinholdtsen <[e-mail]>
-# Date:   2001-11-20
-#
-# Parse logfile from Debian debian-cd build, and report how much each package
-# added to the CD size.
-
-$logfile = ($ARGV[0] ||
-            "$ENV{TDIR}/$ENV{CODENAME}-$ENV{FULLARCH}/log.list2cds");
-
-open(LOG, $logfile) || die "Unable to open $logfile";
-
-my $pkg;
-while (<LOG>) {
-    chomp;
-    $pkg = $1 if (/^\+ Trying to add (.+)\.\.\./);
-    if (/  \$cd_size = (\d+), \$size = (\d+)/) {
-	$cdsize{$pkg} = $1;
-	$size{$pkg} = $2;
-    }
-    last if (/Limit for CD 2 is/);
-    # Add delimiter
-    if (/Standard system already takes (.\d+)/) {
-	my $pkg = "<=============== end of standard pkgs";
-        $size{$pkg} = 0;
-        $cdsize{$pkg} = $1;
-    }
-}
-close(LOG);
-
-print "  +size  cdsize pkgname\n";
-print "-----------------------\n";
-
-for $pkg (sort { $cdsize{$a} <=> $cdsize{$b} } keys %size) {
-    printf "%7d %7d %s\n", $size{$pkg} / 1024, $cdsize{$pkg} / 1024, $pkg;
-}
diff --git a/tools/make-vfat-img b/tools/make-vfat-img
deleted file mode 100755
index 0ef7ab7..0000000
--- a/tools/make-vfat-img
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-dir=""
-size=20
-outfile=""
-while getopts d:s:o: opt; do
-	case "$opt" in
-		d) dir="$OPTARG";;
-		s) size="$OPTARG";;
-		o) outfile="$OPTARG";;
-	esac
-done
-if [ -z "$dir" ] || [ -z "$outfile" ]; then
-	echo "Usage: $0 -d <DIR> -s <SIZE> -o <OUTFILE>"
-	exit 1
-fi
-
-size=$(((($(du -sk $dir | cut -d'	' -f1) + ($size * 1024)) / 32) * 32)) 
-/sbin/mkdosfs -C $outfile $size
-for indir in $(find $dir -mindepth 1 -type d | cut -d/ -f2-); do
-	mmd -i $outfile $indir
-done
-for file in $(find $dir -type f | cut -d/ -f2-); do
-	mcopy -i $outfile $dir/$file ::$file
-done
-
diff --git a/tools/my-dpkg-scanpackages b/tools/my-dpkg-scanpackages
deleted file mode 100755
index 146e91a..0000000
--- a/tools/my-dpkg-scanpackages
+++ /dev/null
@@ -1,264 +0,0 @@
-#! /usr/bin/perl
-
-$version="1.9.17"; # diverted from dpkg 1.9.17
-
-%kmap= ('optional','suggests',
-        'recommended','recommends',
-        'class','priority',
-        'package_revision','revision');
-
-@fieldpri= ('Package',
-            'Version',
-            'Priority',
-            'Section',
-            'Essential',
-            'Maintainer',
-            'Pre-Depends',
-            'Depends',
-            'Recommends',
-            'Suggests',
-            'Conflicts',
-            'Provides',
-            'Replaces',
-            'Architecture',
-            'Filename',
-            'Size',
-            'MD5sum',
-            'Description');
-
-$written=0;
-$i=100; grep($pri{$_}=$i--,@fieldpri);
-
-if ($#ARGV > -1 && $ARGV[0] eq "-m") {
-    shift(@ARGV);
-    $opt_medium = shift(@ARGV); }
-if ($#ARGV > -1 && $ARGV[0] eq "-a") {
-    shift(@ARGV);
-    $opt_arch = shift(@ARGV); }
-$#ARGV == 1 || $#ARGV == 2
-    or die "Usage: dpkg-scanpackages [-m medium] [-a architecture ] binarypath overridefile [pathprefix] > Packages
-\te.g. dpkg-scanpackages -m 'Debian GNU/Linux -a i386 binary-i386' \\
-\t\tbinary-i386 /pub/debian/indices/override.hamm.gz \\
-\t\tdists/stable/ > binary-i386/Packages\n";
-
-($binarydir, $override, $pathprefix) = @ARGV;
--d $binarydir or die "Binary dir $binarydir not found\n";
--e $override or die "Override file $override not found\n";
-
-sub vercmp {
-	($a,$b)=@_;
-	return $vercache{$a,$b} if defined($vercache{$a,$b});
-	system("dpkg --compare-versions $a le $b");
-	$vercache{$a,$a}=$?;
-	return $?;
-}
-
-# The extra slash causes symlinks to be followed.
-open(F,"find $binarydir/ -follow -name '*.deb' -print |")
-    or die "Couldn't open pipe to find: $!\n";
-
-# Note: contrib and other sections are written as contrib/foo in
-#       the overrides and control file
-($sectdir) = "$pathprefix/$binarydir" =~ m:dists/[^\\]+/([^/]+/):;
-$sectdir =~ s:(main|hamm)/::;
-
-while (<F>) {
-    chomp($fn=$_);
-    substr($fn,0,length($binarydir)) eq $binarydir
-	or die "$fn not in binary dir $binarydir\n";
-    $t= `dpkg-deb -I $fn control`;
-    if ($t eq "") {
-	warn "Couldn't call dpkg-deb on $fn: $!, skipping package\n";
-	next;
-    }
-    if ($?) {
-    	warn "\`dpkg-deb -I $fn control' exited with $?, skipping package\n";
-	next;
-    }
-
-    undef %tv;
-    $o= $t;
-    while ($t =~ s/^\n*(\S+):[ \t]*(.*(\n[ \t].*)*)\n//) {
-        $k= lc $1; $v= $2;
-        if (defined($kmap{$k})) { $k= $kmap{$k}; }
-        if (@kn= grep($k eq lc $_, @fieldpri)) {
-            @kn==1 || die $k;
-            $k= $kn[0];
-        }
-        $v =~ s/\s+$//;
-        $tv{$k}= $v;
-    }
-    $t =~ /^\n*$/
-	or die "Unprocessed text from $fn control file; info:\n$o / $t\n";
-
-    defined($tv{'Package'})
-	or die "No Package field in control file of $fn\n";
-    $p= $tv{'Package'}; delete $tv{'Package'};
-
-    $arch=$tv{'Architecture'};
-    if (defined($opt_arch)) {
-        if ($arch =~ $opt_arch || $arch =~ "all") {
-#            print(STDERR " ! Package $p ($fn) is for the correct architecture $opt_arch: $arch\n");
-        } else {
-#            print(STDERR " ! Package $p ($fn) is not for the correct architecture $opt_arch: $arch\n");
-            next;
-        }
-    }
-
-    if (defined($p1{$p})) {
-	if (&vercmp($tv{'Version'}, $pv{$p,'Version'})) {
-	    print(STDERR " ! Package $p (filename $fn) is repeat but newer version;\n".
-		    "   used that one and ignored data from $pfilename{$p} !\n")
-		    || die $!;
-	    delete $p1{$p};
-	    for $k (keys %k1) {
-		delete $pv{$p,$k};
-	    }
-	} else {
-	    print(STDERR " ! Package $p (filename $fn) is repeat;\n".
-			 "   ignored that one and using data from $pfilename{$p} !\n")
-		|| die $!;
-	    next;
-	}
-    }
-    print(STDERR " ! Package $p (filename $fn) has Filename field!\n") || die $!
-        if defined($tv{'Filename'});
-    
-    $tv{'Filename'}= "$pathprefix$fn";
-
-    open(C,"md5sum $fn |") || die "$fn $!";
-    chop($_=<C>); close(C); $? and die "\`md5sum < $fn' exited with $?\n";
-    /^[0-9a-f]{32}/ or die "Strange text from \`md5sum < $fn': \`$_'\n";
-    s/\ .*$//;
-    $tv{'MD5sum'}= $_;
-
-    @stat= stat($fn) or die "Couldn't stat $fn: $!\n";
-    $stat[7] or die "$fn is empty\n";
-    $tv{'Size'}= $stat[7];
-
-    if (length($tv{'Revision'})) {
-        $tv{'Version'}.= '-'.$tv{'Revision'};
-        delete $tv{'Revision'};
-    }
-
-    for $k (keys %tv) {
-        $pv{$p,$k}= $tv{$k};
-        $k1{$k}= 1;
-        $p1{$p}= 1;
-    }
-
-    $_= substr($fn,length($binarydir));
-    s#/[^/]+$##; s#^/*##;
-    $psubdir{$p}= $_;
-    $pfilename{$p}= $fn;
-}
-close(F);
-$? and warn "find exited with $?\n";
-
-select(STDERR); $= = 1000; select(STDOUT);
-
-format STDERR =
-  ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$packages
-.
-
-sub writelist {
-    $title= shift(@_);
-    return unless @_;
-    print(STDERR " $title\n") || die $!;
-    $packages= join(' ',sort @_);
-    while (length($packages)) { write(STDERR) || die $!; }
-    print(STDERR "\n") || die $!;
-}
-
-@samemaint=();
-
-if ($override =~ /\.gz$/) {
-open(O, "/bin/zcat $override|")
-    or die "Couldn't open override file $override: $!\n";
-} else {
-open(O, $override)
-    or die "Couldn't open override file $override: $!\n";
-}
-while (<O>) {
-    s/\#.*//;
-    s/\s+$//;
-    ($p,$priority,$section,$maintainer)= split(/\s+/,$_,4);
-    next unless defined($p1{$p});
-    if (length($maintainer)) {
-        if ($maintainer =~ m/\s*=\>\s*/) {
-            $oldmaint= $`; $newmaint= $'; $debmaint= $pv{$p,'Maintainer'};
-            if (!grep($debmaint eq $_, split(m:\s*//\s*:, $oldmaint))) {
-                push(@changedmaint,
-                     "  $p (package says $pv{$p,'Maintainer'}, not $oldmaint)\n");
-            } else {
-                $pv{$p,'Maintainer'}= $newmaint;
-            }
-        } elsif ($pv{$p,'Maintainer'} eq $maintainer) {
-            push(@samemaint,"  $p ($maintainer)\n");
-        } else {
-            print(STDERR " * Unconditional maintainer override for $p *\n") || die $!;
-            $pv{$p,'Maintainer'}= $maintainer;
-        }
-    }
-    $pv{$p,'Priority'}= $priority;
-    $pv{$p,'Section'}= $section;
-    ($sectioncut = $section) =~ s:^[^/]*/::;
-    if (length($psubdir{$p}) && $section ne $psubdir{$p} &&
-	$sectioncut ne $psubdir{$p}) {
-        print(STDERR " !! Package $p has \`Section: $section',".
-                     " but file is in \`$psubdir{$p}' !!\n") || die $!;
-        $ouches++;
-    }
-    $o1{$p}= 1;
-}
-close(O);
-print(STDERR "\n") || die $! if $ouches;
-
-$k1{'Maintainer'}= 1;
-$k1{'Priority'}= 1;
-$k1{'Section'}= 1;
-
-@missingover=();
-
-for $p (sort keys %p1) {
-    if (!defined($o1{$p})) {
-        push(@missingover,$p);
-    }
-    $r= "Package: $p\n";
-    for $k (sort { $pri{$b} <=> $pri{$a} } keys %k1) {
-        next unless length($pv{$p,$k});
-        $r.= "$k: $pv{$p,$k}\n";
-    }
-    $r.= "X-Medium: $opt_medium\n" if (defined $opt_medium);
-    $r.= "\n";
-    $written++;
-    $p1{$p}= 1;
-    print(STDOUT $r) or die "Failed when writing stdout: $!\n";
-}
-close(STDOUT) or die "Couldn't close stdout: $!\n";
-
-@spuriousover= grep(!defined($p1{$_}),sort keys %o1);
-
-&writelist("** Packages in archive but missing from override file: **",
-           @missingover);
-if (@changedmaint) {
-    print(STDERR
-          " ++ Packages in override file with incorrect old maintainer value: ++\n",
-          @changedmaint,
-          "\n") || die $!;
-}
-if (@samemaint) {
-    print(STDERR
-          " -- Packages specifying same maintainer as override file: --\n",
-          @samemaint,
-          "\n") || die $!;
-}
-if (@spuriousover) {
-    print(STDERR
-          " -- Packages in override file but not in archive: --\n",
-          @spuriousover,
-          "\n") || die $!;
-}
-
-print(STDERR " Wrote $written entries to output Packages file.\n") || die $!;
diff --git a/tools/pi-makelist-vfat b/tools/pi-makelist-vfat
deleted file mode 100755
index 8938d02..0000000
--- a/tools/pi-makelist-vfat
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ $# != 1 ]; then
-    cat << EOF
-Usage: pi-makelist-vfat image.img >image.list
-
-Outputs list of files in a VFAT or in the VFAT of the second partition
-EOF
-    exit 1
-fi
-IMG="$1"
-
-MTOOLSRC=""
-cleanup() {
-    if [ -n "$MTOOLSRC" ]; then
-        rm -f "$MTOOLSRC"
-    fi
-}
-trap "cleanup" 0 1 2 3 9 11 13 15
-export MTOOLSRC=`tempfile --prefix pimkl --mode 644`
-
-# will try both of C: and D:
-cat >$MTOOLSRC <<EOF
-drive c:
-  file="$IMG"
-
-drive d:
-  file="$IMG"
-  partition=1
-
-drive e:
-  file="$IMG"
-  partition=2
-EOF
-
-ARGS="-/ -f -a -b"
-
-drive=""
-for d in "c:" "d:" "e:"; do
-    if mdir "$d" $ARGS >/dev/null 2>&1; then
-        drive="$d"
-        break
-    fi
-done
-
-if [ -z "$drive" ]; then
-    echo "$0: Couldn't list any drive" >&2
-    exit 1
-fi
-
-mdir "$drive" $ARGS | sed '/\/$/ d; s/^[CDE]://'