From f8c0ab436e9803707dc28f20fa6d012215a1ef8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Sat, 2 Mar 2002 19:08:18 +0000
Subject: [PATCH] * Implement the .disk/{kernel,base}_installable stuff. Not
 tested yet.

---
 Makefile       | 17 +++++++++++++++++
 debian/control |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 53b76ba1..06fdaf8c 100755
--- a/Makefile
+++ b/Makefile
@@ -433,6 +433,22 @@ $(SDIR)/CD1/.disk/info:
 packages: bin-infos bin-list $(BDIR)/packages-stamp
 $(BDIR)/packages-stamp:
 	@echo "Adding the selected packages to each CD :"
+	@# Check that all packages required by debootstrap are included
+	@# and create .disk/base_installable if yes
+	$(Q)for DISK in $(FIRSTDISKS); do \
+	if [ -x "`which debootstrap`" ]; then \
+	    ok=yes; \
+	    DISK=$${DISK##CD}; \
+	    for p in `debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
+		if ! grep -q ^$$p$$ $(BDIR)/$$DISK.packages; then \
+		    ok=no; \
+		fi; \
+	    done; \
+	    if [ "$$ok" = "yes" ]; then \
+		touch $(BDIR)/CD$$DISK/.disk/base_installable; \
+	    fi; \
+	fi; \
+	done
 	$(Q)set -e; \
 	 for i in $(BDIR)/*.packages; do \
 		dir=$${i%%.packages}; \
@@ -593,6 +609,7 @@ $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH):
 		$(add_files) \
 	  	$(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
 	  	$(BOOTDISKS) . ; \
+		touch $(BDIR)/.disk/kernel_installable ; \
 		cd $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH); \
 		rm -rf base-images-*; \
 		if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \
diff --git a/debian/control b/debian/control
index 0e18a13d..002ecfb5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: debian-cd
 Section: admin
-Priority: optional
+Priority: extra
 Maintainer: Raphael Hertzog <hertzog@debian.org>
 Build-Depends-Indep: debhelper (>= 3)
 Standards-Version: 3.5.2
 
 Package: debian-cd
 Architecture: all
-Depends: perl5 | perl, libdigest-md5-perl, sysutils, apt (>= 0.3.11.1), make, mkisofs | mkhybrid, lynx, grep-dctrl, apt-utils (>= 0.5.4)
+Depends: perl, libdigest-md5-perl, sysutils, apt (>= 0.3.11.1), make, mkisofs | mkhybrid, lynx, grep-dctrl, apt-utils (>= 0.5.4), debootstrap
 Recommends: hfsutils, debianutils (>= 1.6)
 Suggests: palo (>= 0.94)
 Description: Tools for building (Official) Debian CD set