[PATCH 2/3] Use DEBOOTSTRAP_SCRIPT, BASE_INCLUDE and BASE_EXCLUDE variables to calculate the base packages set
From: Otavio Salvador <otavio@ossystems.com.br>
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 <otavio@ossystems.com.br>
---
Makefile | 11 +++++++++--
debian/changelog | 2 ++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index aba0b81..593c1d4 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 411694b..68f9411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,8 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
[ 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
-- Joey Hess <joeyh@debian.org> Wed, 01 Aug 2007 23:47:14 -0400
Reply to: