Use DEBOOTSTRAP_SCRIPT, BASE_INCLUDE and BASE_EXCLUDE variables to calculate the base packages set From: Otavio Salvador While doing the $(BDIR)/rawlist we need to use the DEBOOTSTRAP_SCRIPT, BASE_INCLUDE and BASE_EXCLUDE variables to better support CDDs. Signed-off-by: Otavio Salvador --- Makefile | 11 +++++++++-- debian/changelog | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f0655ec..15a3b2b 100755 --- a/Makefile +++ b/Makefile @@ -284,8 +284,15 @@ $(BDIR)/rawlist: $(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \ if [ _$(INSTALLER_CD) != _1 ]; then \ for ARCH in $(ARCHES_NOSRC); do \ - debootstrap --arch $$ARCH --print-debs $(CODENAME) $(TDIR)/debootstrap.tmp file:$(MIRROR) 2>/dev/null \ - | tr ' ' '\n' >>$(BDIR)/rawlist; \ + debootstrap --arch $$ARCH \ + --print-debs \ + --include=`cat $$BASE_INCLUDE | tr "\n" "," | sed 's!,$$!!g'` \ + --exclude=`cat $$BASE_EXCLUDE | tr "\n" "," | sed 's!,$$!!g'` \ + $(CODENAME) \ + $(TDIR)/debootstrap.tmp \ + file:$(MIRROR) \ + $(DEBOOTSTRAP_SCRIPT) 2>/dev/null \ + | tr ' ' '\n' >>$(BDIR)/rawlist; \ rm -rf $(TDIR)/debootstrap.tmp; \ done; \ fi; \ diff --git a/debian/changelog b/debian/changelog index 65b9db8..57a9e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,8 +36,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=high [ Otavio Salvador ] * Fix extranonfree support to be backward compatible with previous behaviour (default to false) + * Use DEBOOTSTRAP_SCRIPT, BASE_INCLUDE and BASE_EXCLUDE variables to + calculate the base packages set - -- Otavio Salvador Tue, 29 May 2007 00:50:51 -0300 + -- Otavio Salvador Tue, 29 May 2007 01:08:04 -0300 debian-cd (3.0.2) unstable; urgency=high