Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Makefile: debootstrap no longer accepts options with empty values; change 

the way include/exclude options are passed accordingly.
This commit is contained in:
Frans Pop 2008-01-19 10:17:09 +00:00
parent a8beab40a3
commit 80ec9c9198
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -285,10 +285,13 @@ $(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 \
BINCLUDE=`[ -n "$(BASE_INCLUDE)" ] && cat $(BASE_INCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \
[ -z "$$BINCLUDE" ] || BINCLUDE="--include=$$BINCLUDE"; \
BEXCLUDE=`[ -n "$(BASE_EXCLUDE)" ] && cat $(BASE_EXCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \
[ -z "$$BEXCLUDE" ] || BEXCLUDE="--exclude=$$BEXCLUDE"; \
debootstrap --arch $$ARCH \ debootstrap --arch $$ARCH \
--print-debs \ --print-debs \
--include=`[ -n "$(BASE_INCLUDE)" ] && cat $(BASE_INCLUDE) | tr "\n" "," | sed 's!,$$!!g'` \ $$BINCLUDE $$BEXCLUDE \
--exclude=`[ -n "$(BASE_INCLUDE)" ] && cat $(BASE_EXCLUDE) | tr "\n" "," | sed 's!,$$!!g'` \
$(CODENAME) \ $(CODENAME) \
$(TDIR)/debootstrap.tmp \ $(TDIR)/debootstrap.tmp \
file:$(MIRROR) \ file:$(MIRROR) \

4
debian/changelog vendored
View File

@ -73,11 +73,13 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
file if one is missing. file if one is missing.
* start_new_disc: make multi-arch CD/DVDs and CD/DVDs that are not part of a * start_new_disc: make multi-arch CD/DVDs and CD/DVDs that are not part of a
set (e.g. KDE/Xfce CDs) recognizable through info in .disk directory. set (e.g. KDE/Xfce CDs) recognizable through info in .disk directory.
* Makefile: debootstrap no longer accepts options with empty values; change
the way include/exclude options are passed accordingly.
[ Steve McIntyre ] [ Steve McIntyre ]
* Significant cleanup of list2cds. Closes: #451237 * Significant cleanup of list2cds. Closes: #451237
-- Frans Pop <fjp@debian.org> Wed, 16 Jan 2008 17:47:37 +0100 -- Frans Pop <fjp@debian.org> Sat, 19 Jan 2008 11:14:36 +0100
debian-cd (3.0.3) unstable; urgency=low debian-cd (3.0.3) unstable; urgency=low