* Implement the .disk/{kernel,base}_installable stuff. Not tested yet.

This commit is contained in:
Raphaël Hertzog 2002-03-02 19:08:18 +00:00
parent 1c13f2a59e
commit f8c0ab436e
2 changed files with 19 additions and 2 deletions

View File

@ -433,6 +433,22 @@ $(SDIR)/CD1/.disk/info:
packages: bin-infos bin-list $(BDIR)/packages-stamp packages: bin-infos bin-list $(BDIR)/packages-stamp
$(BDIR)/packages-stamp: $(BDIR)/packages-stamp:
@echo "Adding the selected packages to each CD :" @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; \ $(Q)set -e; \
for i in $(BDIR)/*.packages; do \ for i in $(BDIR)/*.packages; do \
dir=$${i%%.packages}; \ dir=$${i%%.packages}; \
@ -593,6 +609,7 @@ $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH):
$(add_files) \ $(add_files) \
$(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \ $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
$(BOOTDISKS) . ; \ $(BOOTDISKS) . ; \
touch $(BDIR)/.disk/kernel_installable ; \
cd $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH); \ cd $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH); \
rm -rf base-images-*; \ rm -rf base-images-*; \
if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \ if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \

4
debian/control vendored
View File

@ -1,13 +1,13 @@
Source: debian-cd Source: debian-cd
Section: admin Section: admin
Priority: optional Priority: extra
Maintainer: Raphael Hertzog <hertzog@debian.org> Maintainer: Raphael Hertzog <hertzog@debian.org>
Build-Depends-Indep: debhelper (>= 3) Build-Depends-Indep: debhelper (>= 3)
Standards-Version: 3.5.2 Standards-Version: 3.5.2
Package: debian-cd Package: debian-cd
Architecture: all 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) Recommends: hfsutils, debianutils (>= 1.6)
Suggests: palo (>= 0.94) Suggests: palo (>= 0.94)
Description: Tools for building (Official) Debian CD set Description: Tools for building (Official) Debian CD set