Merge ~mwhudson/debian-cd/+git/ubuntu:no-local into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Michael Hudson-Doyle]

remove support for local debs

[Steve Langasek (vorlon)]

review: Approve

diff --git a/CONF.sh b/CONF.sh
index 1d12ad8..18250fc 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -9,9 +9,6 @@ unset EXTRANONFREE      || true
 unset RESTRICTED        || true
 unset UNIVERSE          || true
 unset MULTIVERSE        || true
-# allow configuration on command line
-#unset LOCAL             || true
-#unset LOCALDEBS         || true
 unset SECURED           || true
 unset GPG_HOMEDIR       || true
 unset SIGNING_KEYID     || true
@@ -182,16 +179,6 @@ if [ "$CDIMAGE_UNSUPPORTED" ]; then
   fi
 fi
 
-# If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with 
-# local packages that you want to put on the CD set then
-# uncomment the following line 
-# export LOCAL=1
-
-# If your local packages are not under $MIRROR, but somewhere else, 
-# you can uncomment this line and edit to to point to a directory
-# containing dists/$CODENAME/local/binary-$ARCH
-# export LOCALDEBS=$CDIMAGE_ROOT/local/packages
-
 case $DIST in
   warty) ;;
   hoary|breezy|dapper|edgy|feisty|gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily)
diff --git a/Makefile b/Makefile
index b4888ad..b87b8a3 100644
--- a/Makefile
+++ b/Makefile
@@ -512,23 +512,9 @@ $(SDIR)/sources-stamp:
 		dir=$(SDIR)/CD$$n; \
 		echo -n "$$n ... "; \
 		echo -n "main ... "; \
-		grep -vE "/local/" $$i > $$i.main || true ; \
-		if [ -s $$i.main ] ; then \
-			cat $$i.main | xargs $(add_files) $$dir $(MIRROR); \
+		if [ -s $$i ] ; then \
+			cat $$i | xargs $(add_files) $$dir $(MIRROR); \
 		fi ; \
-		if [ -n "$(LOCAL)" ]; then \
-			echo -n "local ... "; \
-			grep "/local/" $$i > $$i.local || true ; \
-			if [ -s $$i.local ] ; then \
-				if [ -n "$(LOCALDEBS)" ] ; then \
-					cat $$i.local | xargs $(add_files) \
-						$$dir $(LOCALDEBS); \
-			    else \
-					cat $$i.local | xargs $(add_files) \
-						$$dir $(MIRROR); \
-				fi; \
-		    fi; \
-		fi; \
 		$(scansources) $$dir; \
 		echo "done."; \
 	done
diff --git a/README b/README
index 8513768..9b93084 100644
--- a/README
+++ b/README
@@ -232,26 +232,6 @@ can use build_all.sh to build your "Unofficial" images without modifying
 anything.
 
 
-Local packages
-==============
-
-If you provide some custom made packages and you want to put them on
-Debian CD set you can do it. Simply put your packages in
-$MIRROR/dists/$CODENAME/local/binary-$ARCH/<section>.
-The organization of this sub-tree is the same than what you can find
-in the main, contrib or non-free part. You may use different section
-names if you want. Be sure to create Packages files (and Sources.gz if you
-include sources).
-
-You can also put your local packages under $MIRROR/pool/local (just a new
-facility for people who don't want packages under dists/). To include local
-packages, the LOCAL environment variable must be set to "1" while building
-the CDs.
-
-You can also set the LOCALDEBS environment variable, and it will be used
-instead of MIRROR when looking for local packages.
-
-
 Additional targets
 ==================
 
diff --git a/tools/add_dirs b/tools/add_dirs
index a4a9e0c..4262920 100755
--- a/tools/add_dirs
+++ b/tools/add_dirs
@@ -28,13 +28,6 @@ if [ ! -d dists/$CODENAME ] ; then
     done
 fi
 
-# Commodity link for tools which want local in dists/local/local ...
-if [ -n "$LOCAL" ]
-then
-    ln -sf $CODENAME dists/local
-fi
-
-
 if [ ! -d .disk ] ; then
     mkdir .disk
 fi
@@ -78,10 +71,3 @@ if [ "${MULTIVERSE:-0}" != "0" ]; then
     done
     mkdir -p dists/$CODENAME/multiverse/source
 fi
-
-if [ -n "$LOCAL" ]; then
-    for ONE_ARCH in $ALL_ARCHES; do
-	mkdir -p dists/$CODENAME/local/binary-$ONE_ARCH
-    done
-    mkdir -p dists/$CODENAME/local/source
-fi
diff --git a/tools/add_packages b/tools/add_packages
index 80443db..f3ff4d7 100755
--- a/tools/add_packages
+++ b/tools/add_packages
@@ -8,9 +8,6 @@ if (! -d $dir) {
 	die "$dir is not a directory ..."; 
 }
 
-my $mirror  = $ENV{'MIRROR'}  || die "Set the MIRROR var ...\n";
-my $localdebs = $ENV{'LOCALDEBS'} || $mirror;
-my $security = $ENV{'SECURITY'} || $mirror;
 my $basedir = $ENV{'BASEDIR'} || die "Set the BASEDIR var ...\n";
 
 open (LIST, "$basedir/tools/apt-selection cache show @ARGV |") 
diff --git a/tools/apt-selection b/tools/apt-selection
index 582f7da..76e8c5a 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -80,13 +80,6 @@ if [ ! -e "$APTTMP/$CODENAME-$FULLARCH/apt/sources.list" ]; then
 	> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
 	echo "deb-src $SCHEMA$MIRROR $CODENAME $sections" \
 	>> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	# Local packages ...
-	if [ -n "$LOCAL" ]; then
-	  echo "deb $SCHEMA${LOCALDEBS:-$MIRROR} $CODENAME local" \
-	  >> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	  echo "deb-src $SCHEMA${LOCALDEBS:-$MIRROR} $CODENAME local" \
-	  >> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	fi
         # Security mirror ...
         if [ -n "$SECURITY" ]; then
 	  echo "deb $SCHEMA${SECURITY:-$MIRROR} $CODENAME-security $sections" \
diff --git a/tools/list2cds b/tools/list2cds
index d8b17e3..d45f2f4 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -16,7 +16,6 @@ my $limit = $ENV{'SIZELIMIT1'} || $deflimit;
 
 my $nonfree = $ENV{'NONFREE'} || 0;
 my $extranonfree = $ENV{'EXTRANONFREE'} || 0;
-my $local = $ENV{'LOCAL'} || 0;
 my $complete = $ENV{'COMPLETE'} || 0;
 my $exclude = "$list.exclude";
 my $nodepends = $ENV{'NODEPENDS'} || 0;
diff --git a/tools/list2src b/tools/list2src
index 8923ff8..1ee265e 100755
--- a/tools/list2src
+++ b/tools/list2src
@@ -19,7 +19,6 @@ my $nonfree = $ENV{'NONFREE'} || 0;
 my $extranonfree = $ENV{'EXTRANONFREE'} || 0;
 my $contrib = $ENV{'CONTRIB'} || 0;
 my $complete = $ENV{'COMPLETE'} || 0;
-my $local = $ENV{'LOCAL'} || 0;
 my $universe = $ENV{'UNIVERSE'} || 0;
 my $multiverse = $ENV{'MULTIVERSE'} || 0;
 my $restricted = $ENV{'RESTRICTED'} || 0;
@@ -32,7 +31,6 @@ my $verbose = $ENV{'VERBOSE'} || 0;
 
 my $apt_lists = "$ENV{'APT_STATE'}/lists";
 my $mirror = $ENV{'MIRROR'};
-my $localdebs = $ENV{'LOCALDEBS'} || $mirror;
 my $codename = $ENV{'CODENAME'};
 
 $| = 1;
@@ -77,11 +75,6 @@ if ($nonfree or $extranonfree) {
 	push @SOURCES, "$mirror/dists/$codename/non-free/source/Sources.gz";
 }
 
-if ($local and -e "$localdebs/dists/$codename/local/source/Sources.gz")
-{
-	push @SOURCES, "$localdebs/dists/$codename/local/source/Sources.gz";
-}
-
 foreach (@SOURCES) {
 	die "File `$_' cannot be found ..." if not -f;
 }
diff --git a/tools/scanpackages b/tools/scanpackages
index 60dd66d..60cb994 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -32,10 +32,6 @@ fi
 
 COMPONENTS="$SECTIONS"
 
-if [ -n "$LOCAL" ]; then
-  SECTIONS="$SECTIONS local"
-fi
-
 ALL_ARCHES="$ARCH"
 if [ -e "$BASEDIR/data/$CODENAME/multiarch/$ARCH" ]; then
   ALL_ARCHES="$ALL_ARCHES $(cat "$BASEDIR/data/$CODENAME/multiarch/$ARCH")"
@@ -97,22 +93,17 @@ for i in `cd dists; echo *; cd ..`; do
 done
 # Creating the file lists
 for SECT in $SECTIONS; do
-    if [ "$SECT" = local ]; then
-	OUTSECT=main
-    else
-	OUTSECT="$SECT"
-    fi
-    touch $PREFIX.filelist_$OUTSECT
+    touch $PREFIX.filelist_$SECT
     if [ -d "pool/$SECT" ]; then
-	find pool/$SECT | sort >>$PREFIX.filelist_$OUTSECT
+	find pool/$SECT | sort >>$PREFIX.filelist_$SECT
     fi
     if [ -d "pool/unstable/$SECT" ]; then
-	find pool/unstable/$SECT | sort >>$PREFIX.filelist_$OUTSECT
+	find pool/unstable/$SECT | sort >>$PREFIX.filelist_$SECT
     fi
     for DIST in $DISTS; do
 	for ONE_ARCH in $ALL_ARCHES; do
 	    if [ -d "dists/$DIST/$SECT/binary-$ONE_ARCH" ]; then
-		find dists/$DIST/$SECT/binary-$ONE_ARCH | sort >>$PREFIX.filelist_$OUTSECT
+		find dists/$DIST/$SECT/binary-$ONE_ARCH | sort >>$PREFIX.filelist_$SECT
 	    fi
 	done
     done
@@ -148,9 +139,6 @@ if [ ! -d "$BDIR/indices" ]; then
            cp $MIRROR/indices/* $BDIR/indices/
            ;;
     esac
-    if [ -n "$LOCALDEBS" -a -d $LOCALDEBS/indices ]; then
-         cp $LOCALDEBS/indices/* $BDIR/indices/
-    fi
     #gunzip -f $BDIR/indices/*.gz
     for SECT in $SECTIONS; do
 	touch $BDIR/indices/override.$CODENAME.$SECT
diff --git a/tools/scansources b/tools/scansources
index 8097806..6a84317 100755
--- a/tools/scansources
+++ b/tools/scansources
@@ -102,9 +102,6 @@ if [ ! -d "$SDIR/indices" ]; then
            cp $MIRROR/indices/* $SDIR/indices/
            ;;
     esac
-    if [ -n "$LOCALDEBS" -a -d $LOCALDEBS/indices ]; then
-         cp $LOCALDEBS/indices/* $SDIR/indices/
-    fi
     #gunzip -f $SDIR/indices/*.gz
     for SECT in $SECTIONS; do
         touch $SDIR/indices/override.$CODENAME.$SECT
diff --git a/tools/sorting_weights b/tools/sorting_weights
index 17faf62..ae4df73 100755
--- a/tools/sorting_weights
+++ b/tools/sorting_weights
@@ -26,9 +26,6 @@ fi
 if [ "${MULTIVERSE:-0}" != 0 ]; then
 	SECTIONS="$SECTIONS multiverse"
 fi
-if [ "$LOCAL" ]; then
-	SECTIONS="$SECTIONS local"
-fi
 
 rm -f "$BDIR/$CD.weights_in" "$BDIR/$CD.weights"