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

[Michael Hudson-Doyle]

remove all mention of apt/dpkg status file

There is support for using a dpkg status file to seed the list of
package that get included on an ISO. I'm not sure if this way of doing
things has ever been relevant for Ubuntu but it certainly is not any
more.

Step 0.1 of doing apt stuff differently in ubuntu-cdimage and debian-cd

[Steve Langasek (vorlon)]

review: Approve

diff --git a/Makefile b/Makefile
index b87b8a3..bfc52ff 100644
--- a/Makefile
+++ b/Makefile
@@ -274,17 +274,11 @@ src-distclean:
 	$(Q)echo "Cleaning the source build directory"
 	$(Q)rm -rf $(SDIR)
 
-## STATUS and APT ##
+## APT ##
 
-INDEX_EXTENSION=xz
-INDEX_DECOMPRESSOR=xzcat
-
-# Regenerate the status file with only packages that
-# are of priority standard or higher
-status: init $(ADIR)/status
-$(ADIR)/status:
-	@echo "Generating a fake status file for apt-get and apt-cache..."
-	:> $(ADIR)/status
+# 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 \
@@ -292,42 +286,11 @@ $(ADIR)/status:
 			ln -s $$file $(ADIR)/apt/trusted.gpg.d/$$(basename $$file); \
 		fi; \
 	done
-	# Updating the apt database
+	# Create the apt state directory and update the database
 	$(Q)$(apt) update
-	#
-	# Checking the consistence of the standard system
-	# If this does fail, then launch make correctstatus
-	#
-	$(Q)$(apt) check || $(MAKE) correctstatus
-
-# Only useful if the standard system is broken
-# It tries to build a better status file with apt-get -f install
-correctstatus: status apt-update
-	# You may need to launch correctstatus more than one time
-	# in order to correct all dependencies
-	#
-	# Removing packages from the system :
-	$(Q)set -e; \
-	for i in `$(apt) deselected -f install`; do \
-		echo $$i; \
-		perl -i -000 -ne "print unless /^Package: \Q$$i\E/m" \
-		$(ADIR)/status; \
-	done
-	#
-	# Adding packages to the system :
-	$(Q)set -e; \
-	for i in `$(apt) selected -f install`; do \
-	  echo $$i; \
-	  $(apt) cache dumpavail | perl -000 -ne \
-	      "s/^(Package: .*)\$$/\$$1\nStatus: install ok installed/m; \
-	       print if /^Package: \Q$$i\E\s*\$$/m;" \
-	       >> $(ADIR)/status; \
-	done
-	#
-	# Showing the output of apt-get check :
-	$(Q)$(apt) check
+	touch $(ADIR)/apt-setup
 
-apt-update: status
+apt-update: apt-setup
 	@echo "Apt-get is updating its files ..."
 	$(Q)$(apt) update
 
@@ -744,8 +707,3 @@ conf:
 official_images: bin-official_images src-official_images
 bin-official_images: ok bootable bin-images
 src-official_images: ok src-infos src-images
-
-$(CODENAME)_status: ok init
-	@echo "Using the provided status file for $(CODENAME)-$(ARCH) ..."
-	$(Q)cp $(BASEDIR)/data/$(CODENAME)/status.$(ARCH) $(ADIR)/status \
-	 2>/dev/null || $(MAKE) status || $(MAKE) correctstatus
diff --git a/README b/README
index 9b93084..a447282 100644
--- a/README
+++ b/README
@@ -44,7 +44,7 @@ Edit the CONF.sh and change the PATHs for the mirror and so on.
 $ sensible-editor CONF.sh
 $ . CONF.sh
 $ make distclean
-$ make status
+$ make apt-setup
 $ make list COMPLETE=1 SIZELIMIT1=625000000 SRCSIZELIMIT=665000000
 $ make official_images
 [ alternatively, if you only want binary images:
@@ -93,14 +93,7 @@ The process of building a CD is composed of the following steps:
 
 - then we initialize the temporary directory used for the build:
 
-    $ make status
-
-  If this has failed then this will be automatically launched:
-
-    $ make correctstatus
-
-  Note however that "make status" should never fail if it is
-  used for building a CD set for the stable release...
+    $ make apt-setup
 
 - now you can decide what you want on your CDs
 
diff --git a/build_all.sh b/build_all.sh
index 89589a0..0c2cbb3 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -33,7 +33,7 @@ do
 	fi
 	echo " ... cleaning"
 	make distclean
-	make ${CODENAME}_status
+	make apt-setup
 
 	echo " ... selecting packages to include"
 	SIZE_ARGS=''
diff --git a/tools/apt-selection b/tools/apt-selection
index 76e8c5a..a8a524f 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -24,7 +24,7 @@ if [ -z "$FULLARCH" ]; then
 	FULLARCH="$ARCH"
 fi
 
-options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$FULLARCH/status \
+options=" -q -o Dir::State::status=/dev/null
 	  -o Dir::State=$APT_STATE -o Dir::Cache=$APT_CACHE \
 	  -o Dir::Etc=$APTTMP/$CODENAME-$FULLARCH/apt/ \
 	  -o APT::Cache::AllVersions=0 \
@@ -63,8 +63,6 @@ if [ ! -d "$APTTMP/$CODENAME-$FULLARCH/apt" ]; then
 	mkdir -p "$APTTMP/$CODENAME-$FULLARCH/apt"
 fi
 
-touch "$APTTMP/$CODENAME-$FULLARCH/status"
-
 case $MIRROR in
 	*:*)
 		SCHEMA=
diff --git a/tools/list2cds b/tools/list2cds
index d45f2f4..1100519 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -152,27 +152,7 @@ while (@list) {
 }
 =cut
 
-msg(0, "-- Adding standard, required, important and base packages \n" .
-       "   on the first CD ...\n");
-# Automatically include packages listed in the status file
-open(STATUS, "< $adir/status") || die "Can't open status file : $!\n";
-while (defined($_ = <STATUS>)) {
-       next if not m/^Package: (\S+)/;
-       $p = $1;
-       if (not exists $packages{$p}) {
-               msg(1, "WARNING: Package `$p' is listed in the status file "
-                      . "but doesn't exist ! (ignored) \n",
-                      "    TIP: Try to generate the status file with " .
-                       "make (correct)status (after a make distclean)...\n");
-                next;
-       }
-       next if $excluded{$p};
-       add_package($p, ! $norecommends, ! $nosuggests);
-}
-close STATUS;
-msg(0, "   Standard system already takes $cd_size bytes on the first CD.\n");
-
-# Now start to look for packages wanted by the user ...
+# Start to look for packages wanted by the user ...
 msg(0, "-- Starting to add packages to the CDs ...\n");
 open (LIST, "< $list") || die "Can't open $list : $!\n";
 while (defined($_=<LIST>)) {