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

[Michael Hudson-Doyle]

remove cruft

What do you do while you're waiting for the PPA publisher to do its thing? Why not remove unused bits and pieces from debian-cd.

Unmerged commits

3bd15c4... by Michael Hudson-Doyle on 2024-03-12

more vestigal support for multiple ISOs

40e46f7... by Michael Hudson-Doyle on 2024-03-12

remove unused variable from Makefile

f5428e0... by Michael Hudson-Doyle on 2024-03-12

remove "extras" facility and add_files script

9ce1148... by Michael Hudson-Doyle on 2024-03-12

remove references to NONFREE & CONTRIB

also tidy up add_dirs a bit.

diff --git a/CONF.sh b/CONF.sh
index e362162..c193797 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -3,9 +3,6 @@
 #
 
 # Unset all optional variables first to start from a clean state
-unset NONFREE           || true
-unset CONTRIB           || true
-unset EXTRANONFREE      || true
 unset RESTRICTED        || true
 unset UNIVERSE          || true
 unset MULTIVERSE        || true
@@ -156,16 +153,6 @@ export DEBOOTSTRAP=$CDIMAGE_ROOT/scratch/$SUBTREE$PROJECT/$DIST/$IMAGE_TYPE/debo
 # Where live filesystem images live
 export LIVEIMAGES=$CDIMAGE_ROOT/scratch/$SUBTREE$PROJECT/$DIST/$IMAGE_TYPE/live
 
-# Do I want to have NONFREE merged in the CD set
-# export NONFREE=1
-
-# Do I want to have CONTRIB merged in the CD set
-#export CONTRIB=1
-
-# Do I want to have NONFREE on a separate CD (the last CD of the CD set)
-# WARNING: Don't use NONFREE and EXTRANONFREE at the same time !
-# export EXTRANONFREE=1
-
 if [ -z "$CDIMAGE_ONLYFREE" ]; then
   export RESTRICTED=1
 fi
diff --git a/Makefile b/Makefile
index 021bb6c..8d68e41 100644
--- a/Makefile
+++ b/Makefile
@@ -96,9 +96,7 @@ apt=$(BASEDIR)/tools/apt-selection
 list2cds=$(BASEDIR)/tools/list2cds
 add_packages=$(BASEDIR)/tools/add_packages
 add_dirs=$(BASEDIR)/tools/add_dirs
-add_bin_doc=$(BASEDIR)/tools/add-bin-doc
 scanpackages=$(BASEDIR)/tools/scanpackages
-add_files=$(BASEDIR)/tools/add_files
 set_mkisofs_opts=$(BASEDIR)/tools/set_mkisofs_opts
 add_secured=$(BASEDIR)/tools/add_secured
 md5sum=/usr/bin/md5sum
@@ -114,8 +112,6 @@ hardlink=$(BASEDIR)/tools/hardlink
 BDIR=$(TDIR)/$(CODENAME)-$(FULLARCH)
 ADIR=$(APTTMP)/$(CODENAME)-$(FULLARCH)
 
-FIRSTDISKS=CD1 
-
 # riscv64 images are raw images (non-ISO)
 ifeq ($(ARCH),riscv64)
  IMAGE_FORMAT := img
@@ -222,11 +218,6 @@ endif
 ifndef OUT
 	@echo OUT undefined -- set up CONF.sh; false
 endif
-ifdef NONFREE
-ifdef EXTRANONFREE
-	@echo Never use NONFREE and EXTRANONFREE at the same time; false
-endif
-endif
 
 ## INITIALIZATION ##
 
@@ -344,10 +335,7 @@ tree: bin-tree
 bin-tree: ok bin-list $(BDIR)/CD1/ubuntu
 $(BDIR)/CD1/ubuntu:
 	@echo "Adding the required directories to the binary CDs ..."
-	$(Q)set -e; \
-	dir=$(BDIR)/CD1; \
-	mkdir -p $$dir; \
-	$(add_dirs) $$dir; \
+	$(Q)mkdir -p $(BDIR)/CD1 && $(add_dirs) $(BDIR)/CD1
 
 # CD labels / volume ids / disk info
 infos: bin-infos
@@ -433,24 +421,10 @@ installtools: ok bin-infos $(BDIR)/CD1/install
 $(BDIR)/CD1/install:
 	@echo "Adding install tools and documentation ..."
 	$(Q)set -e; \
-	 for DISK in $(FIRSTDISKS) ; do \
-		mkdir $(BDIR)/$$DISK/install ; \
-		if [ -x "$(BASEDIR)/tools/$(CODENAME)/installtools.sh" ]; then \
-			$(BASEDIR)/tools/$(CODENAME)/installtools.sh $(BDIR)/$$DISK ; \
-		fi ; \
-	done
-
-## EXTRAS ##
-
-# Launch the extras scripts correctly for customizing the CDs
-extras: bin-extras
-bin-extras: ok
-	$(Q)if [ -z "$(DIR)" -o -z "$(CD)" -o -z "$(ROOTSRC)" ]; then \
-	  echo "Give me more parameters (DIR, CD and ROOTSRC are required)."; \
-	  false; \
+	mkdir $(BDIR)/$$DISK/install ; \
+	if [ -x "$(BASEDIR)/tools/$(CODENAME)/installtools.sh" ]; then \
+		$(BASEDIR)/tools/$(CODENAME)/installtools.sh $(BDIR)/CD1 ; \
 	fi
-	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(BDIR)/CD$(CD)'" ...
-	$(Q)$(add_files) $(BDIR)/CD$(CD) $(ROOTSRC) $(DIR)
 
 ## IMAGE BUILDING ##
 
diff --git a/tools/add_dirs b/tools/add_dirs
index 4262920..49773b4 100755
--- a/tools/add_dirs
+++ b/tools/add_dirs
@@ -4,29 +4,19 @@
 
 set -e
 
-# There's no difference between NONFREE and EXTRANONFREE for this script
-if [ "${EXTRANONFREE:-0}" != "0" ]
-then
-    NONFREE=1
-fi
-
 cd $1
 
-if [ ! -e ubuntu ] ; then
-    ln -sf . ubuntu
-fi
+ln -sf . ubuntu
 if [ "$ARCH" != "amd64" ] && [ "$ARCH" != "i386" ]; then
   if [ ! -e ubuntu-ports ]; then
     ln -sf . ubuntu-ports
   fi
 fi
 
-if [ ! -d dists/$CODENAME ] ; then
-    mkdir -p dists/$CODENAME
-    for name in stable unstable; do
-	ln -sf $CODENAME dists/$name
-    done
-fi
+mkdir -p dists/$CODENAME
+for name in stable unstable; do
+    ln -sf $CODENAME dists/$name
+done
 
 if [ ! -d .disk ] ; then
     mkdir .disk
@@ -37,37 +27,20 @@ if [ -e "$BASEDIR/data/$CODENAME/multiarch/$ARCH" ]; then
   ALL_ARCHES="$ALL_ARCHES $(cat "$BASEDIR/data/$CODENAME/multiarch/$ARCH")"
 fi
 
-for ONE_ARCH in $ALL_ARCHES; do
-    mkdir -p dists/$CODENAME/main/binary-$ONE_ARCH
-done
-mkdir -p dists/$CODENAME/main/source
-if [ "${CONTRIB:-0}" != 0 ]; then
-    for ONE_ARCH in $ALL_ARCHES; do
-	mkdir -p dists/$CODENAME/contrib/binary-$ONE_ARCH
-    done
-    mkdir -p dists/$CODENAME/contrib/source
-fi
-if [ "${NONFREE:-0}" != "0" ]; then
+mkdirs_for () {
     for ONE_ARCH in $ALL_ARCHES; do
-	mkdir -p dists/$CODENAME/non-free/binary-$ONE_ARCH
+        mkdir -p dists/$CODENAME/$1/binary-$ONE_ARCH
     done
-    mkdir -p dists/$CODENAME/non-free/source
-fi
+    mkdir -p dists/$CODENAME/$1/source
+}
+
+mkdirs_for main
 if [ "${RESTRICTED:-0}" != "0" ]; then
-    for ONE_ARCH in $ALL_ARCHES; do
-	mkdir -p dists/$CODENAME/restricted/binary-$ONE_ARCH
-    done
-    mkdir -p dists/$CODENAME/restricted/source
+    mkdirs_for restricted
 fi
 if [ "${UNIVERSE:-0}" != "0" ]; then
-    for ONE_ARCH in $ALL_ARCHES; do
-	mkdir -p dists/$CODENAME/universe/binary-$ONE_ARCH
-    done
-    mkdir -p dists/$CODENAME/universe/source
+    mkdirs_for universe
 fi
 if [ "${MULTIVERSE:-0}" != "0" ]; then
-    for ONE_ARCH in $ALL_ARCHES; do
-	mkdir -p dists/$CODENAME/multiverse/binary-$ONE_ARCH
-    done
-    mkdir -p dists/$CODENAME/multiverse/source
+    mkdirs_for multivers
 fi
diff --git a/tools/add_files b/tools/add_files
deleted file mode 100755
index 3c61992..0000000
--- a/tools/add_files
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl -w
-
-# First arg, the root of the destination
-# Second arg, the root of the source
-# Other args, the directories/files to copy (relative to the root source)
-
-use strict;
-use File::Find;
-
-my $basedir = $ENV{'BASEDIR'} || die;
-require "$basedir/tools/link.pl";
-
-my $rootdest = shift || die ;
-my $rootsrc = shift || die ;
-my @files = @ARGV;
-my $verbose = $ENV{'VERBOSE'} || 0;
-
-chdir $rootsrc;
-
-sub relative ($) {
-	my $file = shift;
-	$file =~ s#^/*$rootsrc/##;
-	return $file;
-}
-
-sub mkdirs {
-	if (-d and not -l) {
-		my $dir = "$rootdest/" . relative($File::Find::name);
-		return if -d $dir;
-		print "Creating $dir directory ...\n" if ($verbose >= 2);
-		
-		if (not mkdir ($dir, 0775)) {
-			print STDERR "Cannot mkdir $dir : $!\n";
-		}
-	}
-}
-
-sub add_files {
-	if (-f and not -l) {
-	   good_link ("$rootsrc/" . relative($File::Find::name), 
-	              "$rootdest/" . relative($File::Find::name));
-	} elsif (-l) {
-		 #Check if the link is valid in the desttree otherwise
-		 #hardlink it
-		 my $file = $File::Find::name;
-		 $file =~ s#/[^/]+$##;
-		 $file .= "/" . readlink;
-		 if (-e "$rootdest/" . relative($file)) {
-	   		good_link ("$rootsrc/" . relative($File::Find::name), 
-	              		   "$rootdest/" . relative($File::Find::name));
-		 } else {
-		 	$file = real_file ("$rootsrc/$File::Find::name");
-			good_link ($file,
-			           "$rootdest/" . relative($File::Find::name));
-		 }
-	}
-}
-
-find (\&mkdirs, @files);
-find (\&add_files, @files);
-
diff --git a/tools/list2cds b/tools/list2cds
index 1100519..015e6b2 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -14,8 +14,6 @@ my $list = shift;
 my $deflimit = $ENV{'SIZELIMIT'} || shift || 639631360;
 my $limit = $ENV{'SIZELIMIT1'} || $deflimit;
 
-my $nonfree = $ENV{'NONFREE'} || 0;
-my $extranonfree = $ENV{'EXTRANONFREE'} || 0;
 my $complete = $ENV{'COMPLETE'} || 0;
 my $exclude = "$list.exclude";
 my $nodepends = $ENV{'NODEPENDS'} || 0;
@@ -51,7 +49,6 @@ List of prefered packages: $list
 Exclude file: $exclude
 ");
 msg(0, "Complete selected packages with all the rest: "); msg(0, yesno($complete)."\n");
-msg(0, "Include non-free packages: "); msg(0, yesno($nonfree)."\n");
 msg(0, "======================================================================
 ");
 
@@ -97,15 +94,6 @@ if (-e $exclude) {
 	close EXCL;
 }
 
-# Now exclude more packages because of the non-free rules
-if (not $nonfree) {
-	foreach (grep { $packages{$_}{"Section"} =~ /non-free/ }
-	              (keys %packages)) {
-		$excluded{$_} = 'nonfree';
-		$count_excl++;
-	}
-}
-
 msg(0, "Statistics:
 Number of packages: @{ [scalar(keys %packages)] }
 Number of excluded: $count_excl of @{ [scalar(keys %excluded)] }
@@ -199,65 +187,6 @@ if ($complete) {
 }
 msg(0, "CD $cd will only be filled with $cd_size bytes ...\n");
 
-# Now select the non-free packages for an extra CD
-if ($extranonfree and (! $nonfree))
-{
-	my ($p, @toinclude);
-	
-	# Finally accept non-free packages ...
-	foreach $p (grep { $excluded{$_} eq "nonfree" } (keys %excluded))
-	{
-		$excluded{$p} = 0;
-		push @toinclude, $p;
-	}
-	
-	# Start a new CD
-	$cd++;
-	$cd_size = 0;
-	$limit = $ENV{"SIZELIMIT$cd"} || $deflimit;
-	msg(0, "Limit for non-free CD $cd is $limit.\n");
-	
-	# Include non-free packages
-	foreach $p (@toinclude)
-	{
-		add_package($p, 1, 1);
-	}
-
-	# If a contrib package was listed in the list of packages to
-	# include and if COMPLETE=0 there's a chance that the package
-	# will not get included in any CD ... so I'm checking the complete
-	# list again
-	open (LIST, "< $list") || die "Can't open $list : $!\n";
-	while (defined($_=<LIST>)) {
-		chomp;
-		next if m/^\s*$/;
-		next if $_ eq 'FORCE-CD-BREAK';
-		next if $included{$_};
-		next if $excluded{$_};
-		if (not exists $packages{$_}) { 
-		  msg(1, "WARNING: '$_' does not appear to be available ... " . 
-	          	 "(ignored)\n");
-		  next;
-		}
-		add_package ($_, 1, 1);
-	}
-	close LIST;
-
-	# Try to include other packages that could not be included
-	# before (because they depends on excluded non-free packages)
-	if ($complete)
-	{
-	    foreach $p (sort { ($packages{$a}{"Section"} 
-				cmp $packages{$b}{"Section"}) || ($a cmp $b) }
-			grep { not ($included{$_} or $excluded{$_}) } 
-			keys %packages) 
-	    {
-		add_package ($p, 0, 0);
-	    }
-	}
-
-	msg(0, "CD $cd will only be filled with $cd_size bytes ...\n");
-}
 
 # Remove old files
 foreach (glob("$dir/*.packages")) {
diff --git a/tools/scanpackages b/tools/scanpackages
index 84c25d3..23881b1 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -14,12 +14,6 @@ BDIR=$TDIR/$CODENAME-$FULLARCH
 PREFIX=`echo $2 | sed "s?$BDIR/CD?$BDIR/?"`
 
 SECTIONS="main"
-if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
-  SECTIONS="${SECTIONS} non-free"
-fi
-if [ "${CONTRIB:-0}" != "0" ]; then
-  SECTIONS="${SECTIONS} contrib"
-fi
 if [ "${RESTRICTED:-0}" != "0" ]; then
   SECTIONS="${SECTIONS} restricted"
 fi
@@ -88,8 +82,6 @@ DISTS=""
 for i in `cd dists; echo *; cd ..`; do
     if [ ! -L "dists/$i" -a -d "dists/$i" ]; then
 	if [ -d "dists/$i/main/binary-$ARCH" -o \
-	     -d "dists/$i/non-free/binary-$ARCH" -o \
-	     -d "dists/$i/contrib/binary-$ARCH" -o \
 	     -d "dists/$i/restricted/binary-$ARCH" -o \
 	     -d "dists/$i/universe/binary-$ARCH" -o \
 	     -d "dists/$i/multiverse/binary-$ARCH" ]; then
diff --git a/tools/sorting_weights b/tools/sorting_weights
index ae4df73..0518e12 100755
--- a/tools/sorting_weights
+++ b/tools/sorting_weights
@@ -11,12 +11,6 @@ CD="$1"
 shift
 
 SECTIONS="main"
-if [ "${CONTRIB:-0}" != 0 ]; then
-	SECTIONS="$SECTIONS contrib"
-fi
-if [ "${NONFREE:-0}" != 0 ] || [ "${EXTRANONFREE:-0}" != 0 ]; then
-	SECTIONS="$SECTIONS non-free"
-fi
 if [ "${RESTRICTED:-0}" != 0 ]; then
 	SECTIONS="$SECTIONS restricted"
 fi