* Use DEBOOTSTRAP_SCRIPT, BASE_INCLUDE and BASE_EXCLUDE variables to

calculate the base packages set
This commit is contained in:
Otavio Salvador 2007-10-06 18:25:30 +00:00
parent fe78f0cbe0
commit f652d60b84
2 changed files with 11 additions and 2 deletions

View File

@ -284,8 +284,15 @@ $(BDIR)/rawlist:
$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \ $(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
if [ _$(INSTALLER_CD) != _1 ]; then \ if [ _$(INSTALLER_CD) != _1 ]; then \
for ARCH in $(ARCHES_NOSRC); do \ for ARCH in $(ARCHES_NOSRC); do \
debootstrap --arch $$ARCH --print-debs $(CODENAME) $(TDIR)/debootstrap.tmp file:$(MIRROR) 2>/dev/null \ debootstrap --arch $$ARCH \
| tr ' ' '\n' >>$(BDIR)/rawlist; \ --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; \ rm -rf $(TDIR)/debootstrap.tmp; \
done; \ done; \
fi; \ fi; \

2
debian/changelog vendored
View File

@ -22,6 +22,8 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
to allow README.html translation using po4a. to allow README.html translation using po4a.
* Remove the 'Last Modified' date from data/lenny/README.html.in since * Remove the 'Last Modified' date from data/lenny/README.html.in since
it's useless. it's useless.
* Use DEBOOTSTRAP_SCRIPT, BASE_INCLUDE and BASE_EXCLUDE variables to
calculate the base packages set
[ Steve McIntyre ] [ Steve McIntyre ]
* Make daily i386/amd64 lenny builds work again - don't attempt to copy * Make daily i386/amd64 lenny builds work again - don't attempt to copy