Merge ~mwhudson/debian-cd/+git/ubuntu:deb822-sources into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Michael Hudson-Doyle]

This is the partner to https://code.launchpad.net/~mwhudson/ubuntu-cdimage/+git/ubuntu-cdimage-1/+merge/457014, it uses the chdist-list apt setup from that branch to fetch packages from the pool rather than one locally created by debian-cd.

Resubmitting now that my prerequisite branches have all been merged.

[Łukasz Zemczak (sil2100)]

Just a quick question before I try to figure this out on my own by diving into unknown-to-me debian-cd territory: after this change, will it still be possible to build non-deb822-driven series? Since we need to be able to still build jammy and such. Does the apt config used here get propagated to the images?

review: Needs Information

[Michael Hudson-Doyle (mwhudson)]

Nothing about this should affect the images, it's just the apt config that is used to fetch packages to put into the pool.

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

rationalize scanpackages a bunch

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

fix

78aac4e... by Michael Hudson-Doyle on 2024-03-12

remove slightly more dead code

[Michael Hudson-Doyle (mwhudson)]

I've rebased to remove a commit that wasn't meant to be part of this change. I'd like to land this early in the devel cycle...

4ac4808... by Michael Hudson-Doyle on 2024-05-28

do not litter ISO with apt-ftparchive files

Unmerged commits

4ac4808... by Michael Hudson-Doyle on 2024-05-28

do not litter ISO with apt-ftparchive files

78aac4e... by Michael Hudson-Doyle on 2024-03-12

remove slightly more dead code

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

fix

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

rationalize scanpackages a bunch

7187f26... by Michael Hudson-Doyle on 2023-12-06

remove remaining uses of $MIRROR

5a163b4... by Michael Hudson-Doyle on 2023-12-05

remove references to ADIR and APTTMP

84bbdd3... by Michael Hudson-Doyle on 2023-12-05

use ubuntu-cdimage provided apt configuration for all apt work

diff --git a/CONF.sh b/CONF.sh
index da12b60..1672c22 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -136,13 +136,12 @@ export ARCH=`dpkg --print-architecture`
 
 export FULLARCH=$ARCH${SUBARCH:++$SUBARCH}
 
-# IMPORTANT : The 4 following paths must be on the same partition/device.
+# IMPORTANT : The 2 following paths must be on the same partition/device.
 #	      If they aren't then you must set COPYLINK below to 1. This
 #	      takes a lot of extra room to create the sandbox for the ISO
 #	      images, however. Also, if you are using an NFS partition for
 #	      some part of this, you must use this option.
 # Paths to the mirrors
-export MIRROR=${MIRROR:-$CDIMAGE_ROOT/ftp}
 
 # cdimage supports running in subtrees, so handle that path as well
 export SUBTREE=${CDIMAGE_SUBTREE:+$CDIMAGE_SUBTREE/}
@@ -153,10 +152,6 @@ export TDIR=$CDIMAGE_ROOT/scratch/$SUBTREE$PROJECT/$DIST/$IMAGE_TYPE/tmp
 # Path where the images will be written
 export OUT=$CDIMAGE_ROOT/scratch/$SUBTREE$PROJECT/$DIST/$IMAGE_TYPE/debian-cd
 
-# Where we keep the temporary apt stuff.
-# This cannot reside on an NFS mount.
-export APTTMP=$CDIMAGE_ROOT/scratch/$SUBTREE$PROJECT/$DIST/$IMAGE_TYPE/apt
-
 # Where extracted debootstrap scripts live
 export DEBOOTSTRAP=$CDIMAGE_ROOT/scratch/$SUBTREE$PROJECT/$DIST/$IMAGE_TYPE/debootstrap
 
diff --git a/Makefile b/Makefile
index 3aad28e..b1761a9 100644
--- a/Makefile
+++ b/Makefile
@@ -112,8 +112,7 @@ verbose=$(BASEDIR)/tools/verbose_command
 make_raw_img=$(BASEDIR)/tools/make-raw-img
 hardlink=$(BASEDIR)/tools/hardlink
 
-BDIR=$(TDIR)/$(CODENAME)-$(FULLARCH)
-ADIR=$(APTTMP)/$(CODENAME)-$(FULLARCH)
+export BDIR=$(TDIR)/$(CODENAME)-$(FULLARCH)
 
 FIRSTDISKS=CD1 
 
@@ -211,9 +210,6 @@ endif
 ifndef BASEDIR
 	@echo BASEDIR undefined -- set up CONF.sh; false
 endif
-ifndef MIRROR
-	@echo MIRROR undefined -- set up CONF.sh; false
-endif
 ifndef ARCH
 	@echo ARCH undefined -- set up CONF.sh; false
 endif
@@ -232,17 +228,13 @@ endif
 ## INITIALIZATION ##
 
 # Creation of the directories needed
-init: ok $(OUT) $(TDIR) $(BDIR) $(ADIR)
+init: ok $(OUT) $(TDIR) $(BDIR)
 $(OUT):
 	$(Q)mkdir -p $(OUT)
 $(TDIR):
 	$(Q)mkdir -p $(TDIR)
 $(BDIR):
 	$(Q)mkdir -p $(BDIR)
-$(ADIR):
-	$(Q)mkdir -p $(ADIR)
-	$(Q)mkdir -p $(ADIR)/apt-ftparchive-db
-	$(Q)mkdir -p $(ADIR)/apt/preferences.d
 
 ## CLEANINGS ##
 
@@ -260,25 +252,10 @@ distclean: ok bin-distclean
 bin-distclean:
 	$(Q)echo "Cleaning the binary build directory"
 	$(Q)rm -rf $(BDIR)
-	$(Q)rm -rf $(ADIR)
 
 ## APT ##
 
-# Configure apt stuff
-apt-setup: init $(ADIR)/apt-setup
-$(ADIR)/apt-setup:
-	@echo "Setting up archive keyring from host keyring"
-	$(Q)mkdir -p $(ADIR)/apt/trusted.gpg.d
-	$(Q)for file in /etc/apt/trusted.gpg.d/*; do \
-		if [ -e $$file ]; then \
-			ln -s $$file $(ADIR)/apt/trusted.gpg.d/$$(basename $$file); \
-		fi; \
-	done
-	# Create the apt state directory and update the database
-	$(Q)$(apt) update
-	touch $(ADIR)/apt-setup
-
-apt-update: apt-setup
+apt-update:
 	@echo "Apt-get is updating its files ..."
 	$(Q)$(apt) update
 
@@ -385,10 +362,7 @@ ifeq ($(GENERATE_POOL),1)
 	dir=$(BDIR)/CD1; \
 	echo "1 ... "; \
 	grep -v '^#' $(BDIR)/1.packages | xargs -n 200 -r $(add_packages) $$dir; \
-	$(scanpackages) scan $$dir; \
-	echo "done.";
-	@#Now install the Packages and Packages.cd files
-	$(scanpackages) install $(BDIR)/CD1;
+	$(scanpackages) $$dir;
 else
 	@echo "Not generating the package pool"
 endif
diff --git a/build_all.sh b/build_all.sh
index 93eddd4..51f9b26 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -24,13 +24,9 @@ do
 	CDREV=`git rev-parse HEAD`
 	echo "Using revision $CDREV of debian-cd"
 
-	if type find-mirror >/dev/null 2>&1; then
-		# TODO: nasty upcall to cdimage wrapper scripts
-		export MIRROR="$(find-mirror "$ARCH")"
-	fi
 	echo " ... cleaning"
 	make distclean
-	make apt-setup
+	make init
 
 	echo " ... selecting packages to include"
 	SIZE_ARGS=''
diff --git a/tools/apt-selection b/tools/apt-selection
index e373858..723db82 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -1,134 +1,19 @@
 #!/bin/sh
 
-# This is a little shell script that will launch apt-get in dry-run mode
-# to find all the dependencies of a specific package
+set -e
 
-# There's not set -e here because this script may fail !
-# Apt doesn't always work ... 
-# set -e
-
-# Get the configuration information if necessary
-if [ -z "$CODENAME" -o -z "$ARCH" -o -z "$APTTMP" ]; then
-	if [ -e CONF.sh ]; then
-		source CONF.sh
-	else
-		echo "Please set the good environment variables before "
-		echo "launching this program ..."
-		echo "Current values are :"
-		echo "CODENAME=$CODENAME"
-		echo "ARCH=$ARCH"
-		echo "APTTMP=$APTTMP"
-	fi
-fi
-if [ -z "$FULLARCH" ]; then
-	FULLARCH="$ARCH"
-fi
-
-options=" -q -o Dir=$APTTMP/$CODENAME-$FULLARCH/ \
-	  -o Dir::State::status=/dev/null \
-	  -o Dir::State=$APTTMP/$CODENAME-$FULLARCH/apt-state/ \
-	  -o Dir::Cache=$APTTMP/$CODENAME-$FULLARCH/apt-cache/ \
-	  -o Dir::Etc=$APTTMP/$CODENAME-$FULLARCH/apt/ \
-	  -o APT::Cache::AllVersions=0 \
-	  -o APT::Architecture=$ARCH "
-
-if [ -f "$BASEDIR/data/$CODENAME/multiarch/$ARCH" ]; then
-    SECONDARY_ARCH="$(cat $BASEDIR/data/$CODENAME/multiarch/$ARCH)"
-    options="$options -o APT::Architectures=$SECONDARY_ARCH "
-fi
-
-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
-if [ "${UNIVERSE:-0}" != "0" ]; then
-	sections="$sections universe"
-fi
-if [ "${MULTIVERSE:-0}" != "0" ]; then
-	sections="$sections multiverse"
-fi
-
-# Check for the necessary dirs and files ...
-if [ ! -d "$APTTMP/$CODENAME-$FULLARCH/apt-state/lists/partial" ]; then
-	mkdir -p "$APTTMP/$CODENAME-$FULLARCH/apt-state/lists/partial"
-fi
-if [ ! -d "$APTTMP/$CODENAME-$FULLARCH/apt-cache/archives/partial" ]; then
-	mkdir -p "$APTTMP/$CODENAME-$FULLARCH/apt-cache/archives/partial"
-fi
-if [ ! -d "$APTTMP/$CODENAME-$FULLARCH/apt" ]; then
-	mkdir -p "$APTTMP/$CODENAME-$FULLARCH/apt"
-fi
-
-case $MIRROR in
-	*:*)
-		SCHEMA=
-		;;
-	*)
-		SCHEMA=file:
-		;;
-esac
-
-if [ ! -e "$APTTMP/$CODENAME-$FULLARCH/apt/sources.list" ]; then
-	# Generating a correct sources.list file
-	echo "deb $SCHEMA$MIRROR $CODENAME $sections" \
-	> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	echo "deb-src $SCHEMA$MIRROR $CODENAME $sections" \
-	>> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	# Post-release updates
-	if [ "${UPDATES:-0}" != "0" ]; then
-	  echo "deb $SCHEMA$MIRROR $CODENAME-updates $sections" \
-	  >> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	  echo "deb-src $SCHEMA$MIRROR $CODENAME-updates $sections" \
-	  >> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	fi
-	if [ "${PROPOSED:-0}" != "0" ]; then
-	  echo "deb $SCHEMA$MIRROR $CODENAME-proposed $sections" \
-	  >> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	  echo "deb-src $SCHEMA$MIRROR $CODENAME-proposed $sections" \
-	  >> $APTTMP/$CODENAME-$FULLARCH/apt/sources.list
-	fi
-fi
-
-temp=$APTTMP/$CODENAME-$FULLARCH/temp.apt-selection
+export APT_CONFIG=$(eval "echo \$APT_CONFIG_${ARCH}")
 
 # Launch the command
 if [ "$1" = "update" -o "$1" = "check" -o "$1" = "download" ]; then
-	apt-get $options $@
-	exit $?
-elif [ "$1" = "cache" ]; then
-	shift
-	apt-cache $options $@
-	exit $?
+	apt-get $@
 elif [ "$1" = "config" ]; then
 	shift
-	apt-config $options $@
-	exit $?
-elif [ "$1" = "deselected" ]; then
-	shift
-	apt-get $options -s $@ > $temp
-	num=$?
-	#if [ $num -ne 0 ]; then 
-	    #echo ": Param: apt-selection deselected $@" >&2; 
-	    #exit $num;  
-	#fi
-	perl -ne 'print "$1\n" if /^Remv (\S+).*/' $temp | sort
-elif [ "$1" = "selected" ]; then
+	apt-config $@
+elif [ "$1" = "cache" ]; then
 	shift
-	apt-get $options -s $@ > $temp 
-	num=$?
-	#if [ $num -ne 0 ]; then 
-	#    echo "ERROR: Param: apt-selection selected $@" >&2; 
-	#    exit $num;  
-	#fi
-	perl -ne 'print "$1\n" if /^Inst (\S+).*/' $temp | sort
+	apt-cache -o APT::Cache::AllVersions=0 $@
 else
-	apt-get $options -s $@
-	exit $?
+	apt-get -s $@
 fi
 
diff --git a/tools/guess-mirror b/tools/guess-mirror
new file mode 100755
index 0000000..0aef719
--- /dev/null
+++ b/tools/guess-mirror
@@ -0,0 +1,36 @@
+#!/usr/bin/python3
+
+# This script tries to work out the "main" mirror for where we are
+# pulling packages from the pool from -- by looking for the first
+# .sources file and taking the first URI from that.
+#
+# This is used by scanpackages to find the overrides files when
+# building the pool, so it's a little bit important that this works
+# for production builds but not very important if it returns something
+# bogus when doing something peculiar like building an image out of
+# the rebuild archive.
+
+import glob
+import os
+import subprocess
+import sys
+
+from debian import deb822
+
+
+def getconfig(v):
+    env = dict(os.environ, APT_CONFIG=os.environ["APT_CONFIG_" + os.environ["ARCH"]])
+    cmd = ["sh", "-c", "eval $(apt-config shell X {}); echo $X".format(v)]
+    cp = subprocess.run(cmd, env=env, encoding='utf-8', capture_output=True)
+    return cp.stdout.strip()
+
+
+sources_list_d = getconfig("Dir::Etc::sourceparts/d")
+
+first_sources_path = glob.glob(os.path.join(sources_list_d, '*.sources'))[0]
+
+with open(first_sources_path) as sources:
+    for para in deb822.Deb822.iter_paragraphs(sources):
+        if 'URIs' in para:
+            print(para['URIs'].split()[0])
+            sys.exit()
diff --git a/tools/list2cds b/tools/list2cds
index 1100519..e7884ee 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -25,7 +25,6 @@ my $maxcds = 1;
 my $overflowbincds = $ENV{'OVERFLOWBINCDS'} || 1;
 
 my $apt = "$ENV{'BASEDIR'}/tools/apt-selection";
-my $adir = "$ENV{'APTTMP'}/$ENV{'CODENAME'}-$ENV{'FULLARCH'}";
 my $dir = "$ENV{'TDIR'}/$ENV{'CODENAME'}-$ENV{'FULLARCH'}";
 my $verbose = $ENV{'VERBOSE'} || 0;
 
diff --git a/tools/scanpackages b/tools/scanpackages
index 84c25d3..62d0e48 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -4,22 +4,9 @@
 # See the README file for the license
 
 # This script will create the Packages.gz and the Packages.cd files
-# First arg = "scan" or "install"
-# Second arg = directory of the CD
-
-#set -e
-
-BDIR=$TDIR/$CODENAME-$FULLARCH
-
-PREFIX=`echo $2 | sed "s?$BDIR/CD?$BDIR/?"`
+# Only arg = directory of the CD
 
 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
@@ -30,89 +17,23 @@ if [ "${MULTIVERSE:-0}" != "0" ]; then
   SECTIONS="${SECTIONS} multiverse"
 fi
 
-COMPONENTS="$SECTIONS"
-
 ALL_ARCHES="$ARCH"
 if [ -e "$BASEDIR/data/$CODENAME/multiarch/$ARCH" ]; then
   ALL_ARCHES="$ALL_ARCHES $(cat "$BASEDIR/data/$CODENAME/multiarch/$ARCH")"
 fi
 
-
-cd "$2"
-
-if [ "$1" = "install" ]; then
-
-# these two lines can be inserted below the "Architectures" line below,
-# to sort out broken Release files just after the testing --> stable
-# transition
-#     sed -e "s/^Suite: .*$/Suite: stable/" | \
-#     sed -e "s/^Description: .*$/Description: Debian $DEBVERSION/" | \
-
-$BASEDIR/tools/apt-selection update
-
-# Appending /d to the name of the configuration item gets apt-config
-# to expand the item into a full directory path.
-eval "$($BASEDIR/tools/apt-selection config shell APT_LISTS_DIR Dir::state::lists/d)"
-
-IN_RELEASE=$APT_LISTS_DIR/*_dists_${CODENAME}_InRelease
-
-if [ -e $IN_RELEASE ]; then
-    # Strip the MD5Sum, SHA1, and SHA256 fields
-    # Update some other information as well
-    gpg --verify --output - $IN_RELEASE 2>/dev/null | \
-    sed -e "s/^Architectures: .*$/Architectures: $ALL_ARCHES/" | \
-    sed -e "s|^Components: .*$|Components: $COMPONENTS|" | \
-    perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next }
-    if ($f) {
-	unless (/^ /) { print; $f=0 }
-    } else { print }' > dists/$CODENAME/Release
-else
-    echo "ERROR: Release file ($IN_RELEASE) is missing !"
-    exit 1
-fi
-
-# Generating Packages files
-apt-ftparchive --no-contents --no-md5 --no-sha1 generate $PREFIX.generate-binary
-
-fi ## END "$1" = "install"
-
-# Prepare the files needed to generate the Packages files
-if [ "$1" != "scan" ]; then exit 0; fi
+cd "$1"
 
 #
 # Create the file lists and the config files for apt-ftparchive generate
 #
 
-# We have to scan all possible dists where packages can be
-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
-	    DISTS="$DISTS $i"
-	fi
-    fi
-done
 # Creating the file lists
 for SECT in $SECTIONS; do
-    touch $PREFIX.filelist_$SECT
+    touch ../1.filelist_$SECT
     if [ -d "pool/$SECT" ]; then
-	find pool/$SECT | sort >>$PREFIX.filelist_$SECT
-    fi
-    if [ -d "pool/unstable/$SECT" ]; then
-	find pool/unstable/$SECT | sort >>$PREFIX.filelist_$SECT
+	find pool/$SECT | sort >>../1.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_$SECT
-	    fi
-	done
-    done
 done
 
 # Appending /d to the name of the configuration item gets apt-config
@@ -121,18 +42,18 @@ eval "$($BASEDIR/tools/apt-selection config shell APT_DIR Dir/d)"
 mkdir -p $APT_DIR/apt-ftparchive-db
 
 # Creating the config files
-cat >$PREFIX.generate-binary <<EOF
-Dir::ArchiveDir "$2";
+cat >../1.generate-binary <<EOF
+Dir::ArchiveDir "$1";
 Dir::OverrideDir "$BDIR/indices";
 Dir::CacheDir "$APT_DIR/apt-ftparchive-db";
 
 TreeDefault::Contents " ";
 
 Tree "dists/$CODENAME" {
-    FileList "$PREFIX.filelist_\$(SECTION)";
+    FileList "../1.filelist_\$(SECTION)";
     Sections "$SECTIONS";
     Architectures "$ALL_ARCHES";
-    
+
     BinOverride "override.$CODENAME.\$(SECTION)";
     ExtraOverride "override.$CODENAME.extra.\$(SECTION)";
     SrcOverride "override.$CODENAME.\$(SECTION).src";
@@ -140,40 +61,52 @@ Tree "dists/$CODENAME" {
 EOF
 
 # Creating the indices directory
-if [ ! -d "$BDIR/indices" ]; then
-    mkdir $BDIR/indices
-    case $MIRROR in
-       *:*)
-           wget -nv -nd -A "*$CODENAME*" -P $BDIR/indices -m -l 1 \
-                $MIRROR/indices
-           ;;
-       *)
-           cp $MIRROR/indices/* $BDIR/indices/
-           ;;
-    esac
-    #gunzip -f $BDIR/indices/*.gz
-    for SECT in $SECTIONS; do
-	touch $BDIR/indices/override.$CODENAME.$SECT
-	touch $BDIR/indices/override.$CODENAME.extra.$SECT
-	touch $BDIR/indices/override.$CODENAME.$SECT.src
-	# We will only use the override files for the release pocket, so
-	# merge in overrides from any update pockets we're using.
-	if [ "${UPDATES:-0}" != "0" ]; then
-	    cat $BDIR/indices/override.$CODENAME-updates.$SECT >> $BDIR/indices/override.$CODENAME.$SECT
-	    cat $BDIR/indices/override.$CODENAME-updates.extra.$SECT >> $BDIR/indices/override.$CODENAME.extra.$SECT
-	    cat $BDIR/indices/override.$CODENAME-updates.$SECT.src >> $BDIR/indices/override.$CODENAME.$SECT.src
-	fi
-	if [ "${PROPOSED:-0}" != "0" ]; then
-	    cat $BDIR/indices/override.$CODENAME-proposed.$SECT >> $BDIR/indices/override.$CODENAME.$SECT
-	    cat $BDIR/indices/override.$CODENAME-proposed.extra.$SECT >> $BDIR/indices/override.$CODENAME.extra.$SECT
-	    cat $BDIR/indices/override.$CODENAME-proposed.$SECT.src >> $BDIR/indices/override.$CODENAME.$SECT.src
-	fi
-	# TODO: evil hack that relies on cdimage/bin/germinate-to-tasks
-	grep -vw Task "$BDIR/indices/override.$CODENAME.extra.$SECT" > "$BDIR/indices/override.$CODENAME.extra.$SECT.new"
-	mv "$BDIR/indices/override.$CODENAME.extra.$SECT.new" "$BDIR/indices/override.$CODENAME.extra.$SECT"
-	cat "$BASEDIR/tasks/auto/$IMAGE_TYPE/$PROJECT/$CODENAME/override.$FULLARCH" >> "$BDIR/indices/override.$CODENAME.extra.$SECT"
-	"$BASEDIR/tools/sync-priorities" "$BDIR/indices/override.$CODENAME.$SECT" "$BASEDIR/tasks/auto/$IMAGE_TYPE/$PROJECT/$CODENAME/important.$FULLARCH"
-    done
+mkdir $BDIR/indices
+wget -nv -nd -A "*$CODENAME*" -P $BDIR/indices -m -l 1 \
+     $MIRROR/indices
+for SECT in $SECTIONS; do
+    touch $BDIR/indices/override.$CODENAME.$SECT
+    touch $BDIR/indices/override.$CODENAME.extra.$SECT
+    touch $BDIR/indices/override.$CODENAME.$SECT.src
+    # We will only use the override files for the release pocket, so
+    # merge in overrides from any update pockets we're using.
+    if [ "${UPDATES:-0}" != "0" ]; then
+        cat $BDIR/indices/override.$CODENAME-updates.$SECT >> $BDIR/indices/override.$CODENAME.$SECT
+        cat $BDIR/indices/override.$CODENAME-updates.extra.$SECT >> $BDIR/indices/override.$CODENAME.extra.$SECT
+        cat $BDIR/indices/override.$CODENAME-updates.$SECT.src >> $BDIR/indices/override.$CODENAME.$SECT.src
+    fi
+    if [ "${PROPOSED:-0}" != "0" ]; then
+        cat $BDIR/indices/override.$CODENAME-proposed.$SECT >> $BDIR/indices/override.$CODENAME.$SECT
+        cat $BDIR/indices/override.$CODENAME-proposed.extra.$SECT >> $BDIR/indices/override.$CODENAME.extra.$SECT
+        cat $BDIR/indices/override.$CODENAME-proposed.$SECT.src >> $BDIR/indices/override.$CODENAME.$SECT.src
+    fi
+    # TODO: evil hack that relies on cdimage/bin/germinate-to-tasks
+    grep -vw Task "$BDIR/indices/override.$CODENAME.extra.$SECT" > "$BDIR/indices/override.$CODENAME.extra.$SECT.new"
+    mv "$BDIR/indices/override.$CODENAME.extra.$SECT.new" "$BDIR/indices/override.$CODENAME.extra.$SECT"
+    cat "$BASEDIR/tasks/auto/$IMAGE_TYPE/$PROJECT/$CODENAME/override.$FULLARCH" >> "$BDIR/indices/override.$CODENAME.extra.$SECT"
+    "$BASEDIR/tools/sync-priorities" "$BDIR/indices/override.$CODENAME.$SECT" "$BASEDIR/tasks/auto/$IMAGE_TYPE/$PROJECT/$CODENAME/important.$FULLARCH"
+done
+
+# Appending /d to the name of the configuration item gets apt-config
+# to expand the item into a full directory path.
+eval "$($BASEDIR/tools/apt-selection config shell APT_LISTS_DIR Dir::state::lists/d)"
+
+IN_RELEASE=$APT_LISTS_DIR/*_dists_${CODENAME}_InRelease
+
+if [ -e $IN_RELEASE ]; then
+    # Strip the MD5Sum, SHA1, and SHA256 fields
+    # Update some other information as well
+    gpg --verify --output - $IN_RELEASE 2>/dev/null | \
+    sed -e "s/^Architectures: .*$/Architectures: $ALL_ARCHES/" | \
+    sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
+    perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next }
+    if ($f) {
+	unless (/^ /) { print; $f=0 }
+    } else { print }' > dists/$CODENAME/Release
+else
+    echo "ERROR: Release file ($IN_RELEASE) is missing !"
+    exit 1
 fi
 
-exit 0
+# Generating Packages files
+apt-ftparchive --no-contents --no-md5 --no-sha1 generate ../1.generate-binary