From f150eabdff7b92f0f142beab0e650fa6e7b67bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Sat, 2 Mar 2002 19:45:24 +0000 Subject: [PATCH] * First fix for the creation of .disk/kernel_installable. * Added the corresponding changelog entry. --- Makefile | 2 +- debian/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 06fdaf8c..d1d16245 100755 --- a/Makefile +++ b/Makefile @@ -609,7 +609,7 @@ $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH): $(add_files) \ $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \ $(BOOTDISKS) . ; \ - touch $(BDIR)/.disk/kernel_installable ; \ + touch $(BDIR)/$$DISK/.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/changelog b/debian/changelog index ca1fd6ba..57ec7b24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ debian-cd (2.2.13) unstable; urgency=low * Don't include the base-images-* directories on the CD. They are meant for people wishing to install by floppy (who download the floppy images from the net). + * Corrected the priority to match the priority given in the override file. + * CDs with .disk/kernel_installable have the disks- directories + and those with .disk/base_installable have all the packages required + by debootstrap. -- Raphael Hertzog Sun, 20 Jan 2002 15:42:29 +0100