debian-cd

Merge ~mwhudson/debian-cd/+git/ubuntu:only-CD1 into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

  1. Git
  2. lp:~mwhudson/debian-cd/+git/ubuntu
  3. only-CD1
  4. Merge into main
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: d50cf6e243bb8bf83de4a5f72b804a78dba4d12d
Proposed branch: ~mwhudson/debian-cd/+git/ubuntu:only-CD1
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 417 lines (+68/-199)
3 files modified
CONF.sh (+0/-8)
Makefile (+66/-189)
tools/list2cds (+2/-2)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+455326@code.launchpad.net

Commit message

Remove support for building multiple binary CDs for a single project

Description of the change

I think I'm done for now, at least for the rest of the day!

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

FWIW I've tested this locally now.

Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

On Mon, 20 Nov 2023, 18:42 Steve Langasek, <email address hidden>
wrote:

> Review: Needs Fixing
>
>
>
> Diff comments:
>
> > diff --git a/Makefile b/Makefile
> > index bfe1368..b9c957d 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -39,55 +39,31 @@ CAPSUBPROJECT:=" Legacy"
> > endif
> > endif
> > ifndef BINDISKINFO
> > -ifneq ($(MAXCDS),1)
> > -export BINDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION)
> \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) Binary-$$num ($$DATE)"
> > -else
> > export BINDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION)
> \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) ($$DATE)"
> > endif
> > -endif
> > ifndef SRCDISKINFO
> > -export SRCDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION)
> \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num ($$DATE)"
> > +export SRCDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION)
> \"$(CAPCODENAME)\" - $(OFFICIAL) Source-1 ($$DATE)"
>
> But we do produce multiple source ISOs for a release...
> https://cdimage.ubuntu.com/releases/20.04.6/release/source/

Oh oops. Guess I'd better put that back then.

>

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Ok, I rebased this to only remove the code for handling multiple binary CDs. Not sure I have the patience to test a source ISO build locally, I assume it would need to download rather a lot of data...

Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Ah oops I had a git failure there and let a commit in I meant to exclude. Try again?

Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/CONF.sh b/CONF.sh
2index 51a0087..b15a95a 100644
3--- a/CONF.sh
4+++ b/CONF.sh
5@@ -31,7 +31,6 @@ unset DEFBINSIZE || true
6 unset DEFSRCSIZE || true
7 unset FASTSUMS || true
8 unset DI_CODENAME || true
9-unset MAXCDS || true
10 unset OMIT_MANUAL || true
11 unset OMIT_RELEASE_NOTES || true
12
13@@ -314,13 +313,6 @@ export FASTSUMS=1
14 # for all architectures.
15 #export KERNEL_PARAMS="priority=critical"
16
17-# If set, limits the number of binary CDs to produce.
18-if [ "$CDIMAGE_DVD" = 1 ]; then
19- export MAXCDS=1
20-else
21- export MAXCDS=1
22-fi
23-
24 # If set to 0, never overflow binary CDs (for when you only want a single CD
25 # and want to know when it overflows).
26 export OVERFLOWBINCDS=0
27diff --git a/Makefile b/Makefile
28index bfe1368..74d82a0 100644
29--- a/Makefile
30+++ b/Makefile
31@@ -39,53 +39,29 @@ CAPSUBPROJECT:=" Legacy"
32 endif
33 endif
34 ifndef BINDISKINFO
35-ifneq ($(MAXCDS),1)
36-export BINDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) Binary-$$num ($$DATE)"
37-else
38 export BINDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) ($$DATE)"
39 endif
40-endif
41 ifndef SRCDISKINFO
42 export SRCDISKINFO="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num ($$DATE)"
43 endif
44 # ND=No-Date versions for README
45 ifndef BINDISKINFOND
46-ifneq ($(MAXCDS),1)
47-export BINDISKINFOND="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH) Binary-$$num"
48-else
49 export BINDISKINFOND="$(CAPPROJECT)$(CAPSUBPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(FULLARCH)"
50 endif
51-endif
52 ifndef SRCDISKINFOND
53 export SRCDISKINFOND="$(CAPPROJECT) $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num"
54 endif
55 ifndef BINVOLID
56 ifeq ($(ARCH),powerpc)
57-ifneq ($(MAXCDS),1)
58-BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc $$num"
59-else
60 BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc"
61-endif
62 else ifeq ($(ARCH),ppc64el)
63-ifneq ($(MAXCDS),1)
64-BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc64 $$num"
65-else
66 BINVOLID="$(CAPPROJECT) $(DEBVERSION) ppc64"
67-endif
68 else ifeq ($(ARCH),riscv64)
69-ifneq ($(MAXCDS),1)
70-BINVOLID="$(CAPPROJECT) $(DEBVERSION) riscv $$num"
71-else
72 BINVOLID="$(CAPPROJECT) $(DEBVERSION) riscv"
73-endif
74-else
75-ifneq ($(MAXCDS),1)
76-BINVOLID="$(CAPPROJECT) $(DEBVERSION) $(ARCH) $$num"
77 else
78 BINVOLID="$(CAPPROJECT) $(DEBVERSION) $(ARCH)"
79 endif
80 endif
81-endif
82 ifndef SRCVOLID
83 SRCVOLID="$(CAPPROJECT) $(DEBVERSION) Source $$num"
84 endif
85@@ -451,13 +427,9 @@ bin-tree: ok bin-list $(BDIR)/CD1/ubuntu
86 $(BDIR)/CD1/ubuntu:
87 @echo "Adding the required directories to the binary CDs ..."
88 $(Q)set -e; \
89- for i in $(BDIR)/*.packages; do \
90- dir=$${i%%.packages}; \
91- dir=$${dir##$(BDIR)/}; \
92- dir=$(BDIR)/CD$$dir; \
93- mkdir -p $$dir; \
94- $(add_dirs) $$dir; \
95- done
96+ dir=$(BDIR)/CD1; \
97+ mkdir -p $$dir; \
98+ $(add_dirs) $$dir; \
99
100 src-tree: ok src-list $(SDIR)/CD1/ubuntu
101 $(SDIR)/CD1/ubuntu:
102@@ -477,15 +449,11 @@ bin-infos: bin-tree $(BDIR)/CD1/.disk/info
103 $(BDIR)/CD1/.disk/info:
104 @echo "Generating the binary CD labels and their volume ids ..."
105 $(Q)set -e; \
106- nb=`find $(BDIR) -name \*.packages | grep '^..?\.packages$$' | wc -l | tr -d " "`; num=0;\
107- DATE=$${CDIMAGE_DATE:-`date +%Y%m%d`}; \
108- for i in $(BDIR)/*.packages; do \
109- num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
110- dir=$(BDIR)/CD$$num; \
111- echo -n $(BINDISKINFO) > $$dir/.disk/info; \
112- echo -n $(BINVOLID) > $(BDIR)/$${num}.volid; \
113- $(set_mkisofs_opts) bin $$num > $(BDIR)/$${num}.mkisofs_opts; \
114- done
115+ DATE=$${CDIMAGE_DATE:-`date +%Y%m%d`}; \
116+ echo -n $(BINDISKINFO) > $(BDIR)/CD1/.disk/info; \
117+ echo -n $(BINVOLID) > $(BDIR)/1.volid; \
118+ $(set_mkisofs_opts) bin 1 > $(BDIR)/$${num}.mkisofs_opts; \
119+
120 src-infos: src-tree $(SDIR)/CD1/.disk/info
121 $(SDIR)/CD1/.disk/info:
122 @echo "Generating the source CD labels and their volume ids ..."
123@@ -525,23 +493,13 @@ endif
124 >> $(BDIR)/1.packages; \
125 fi
126 $(Q)set -e; \
127- for i in $(BDIR)/*.packages; do \
128- dir=$${i%%.packages}; \
129- n=$${dir##$(BDIR)/}; \
130- dir=$(BDIR)/CD$$n; \
131- echo "$$n ... "; \
132- grep -v '^#' $$i | xargs -n 200 -r $(add_packages) $$dir; \
133- $(scanpackages) scan $$dir; \
134- echo "done."; \
135- done
136+ dir=$(BDIR)/CD1; \
137+ echo "1 ... "; \
138+ grep -v '^#' $(BDIR)/1.packages | xargs -n 200 -r $(add_packages) $$dir; \
139+ $(scanpackages) scan $$dir; \
140+ echo "done.";
141 @#Now install the Packages and Packages.cd files
142- $(Q)set -e; \
143- for i in $(BDIR)/*.packages; do \
144- dir=$${i%%.packages}; \
145- dir=$${dir##$(BDIR)/}; \
146- dir=$(BDIR)/CD$$dir; \
147- $(scanpackages) install $$dir; \
148- done
149+ $(scanpackages) install $(BDIR)/CD1;
150 ifeq ($(LIVE_FILESYSTEM),1)
151 $(Q)$(add_live_filesystem)
152 endif
153@@ -589,25 +547,21 @@ bootable: ok installtools packages $(BDIR)/bootable-stamp
154 $(BDIR)/bootable-stamp:
155 @echo "Making the binary CDs bootable ..."
156 $(Q)set -e; \
157- for file in $(BDIR)/*.packages; do \
158- dir=$${file%%.packages}; \
159- n=$${dir##$(BDIR)/}; \
160- dir=$(BDIR)/CD$$n; \
161- if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) ]; then \
162- cd $(BDIR); \
163- echo "Running tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) $$n $$dir" ; \
164- $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) $$n $$dir; \
165- elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) ]; then \
166- cd $(BDIR); \
167- echo "Running tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir" ; \
168- $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) $$n $$dir; \
169- else \
170- if [ "$${IGNORE_MISSING_BOOT_SCRIPT:-0}" = "0" ]; then \
171- echo "No script to make CDs bootable for $(FULLARCH) ..."; \
172- exit 1; \
173- fi; \
174- fi; \
175- done
176+ dir=$(BDIR)/CD1; \
177+ if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) ]; then \
178+ cd $(BDIR); \
179+ echo "Running tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) 1 $$dir" ; \
180+ $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(FULLARCH) 1 $$dir; \
181+ elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) ]; then \
182+ cd $(BDIR); \
183+ echo "Running tools/boot/$(DI_CODENAME)/boot-$(ARCH) 1 $$dir" ; \
184+ $(BASEDIR)/tools/boot/$(DI_CODENAME)/boot-$(ARCH) 1 $$dir; \
185+ else \
186+ if [ "$${IGNORE_MISSING_BOOT_SCRIPT:-0}" = "0" ]; then \
187+ echo "No script to make CDs bootable for $(FULLARCH) ..."; \
188+ exit 1; \
189+ fi; \
190+ fi;
191 $(Q)touch $(BDIR)/bootable-stamp
192
193 # Add the install stuff on the first CD
194@@ -643,41 +597,14 @@ src-extras:
195
196 ## IMAGE BUILDING ##
197
198-# Get some size info about the build dirs
199-imagesinfo: bin-imagesinfo
200-bin-imagesinfo: ok
201- $(Q)for i in $(BDIR)/*.packages; do \
202- echo `du -sb $${i%%.packages}`; \
203- done
204-src-imagesinfo: ok
205- $(Q)for i in $(SDIR)/*.sources; do \
206- echo `du -sb $${i%%.sources}`; \
207- done
208-
209 # Generate a md5sum.txt file listings all files on the CD
210 md5list: bin-md5list src-md5list
211 bin-md5list: ok packages bin-secured $(BDIR)/CD1/md5sum.txt
212 $(BDIR)/CD1/md5sum.txt:
213 @echo "Generating md5sum of files from all the binary CDs ..."
214- $(Q)set -e; \
215- if [ "$$FASTSUMS" != "1" ] ; then \
216- for file in $(BDIR)/*.packages; do \
217- dir=$${file%%.packages}; \
218- n=$${dir##$(BDIR)/}; \
219- dir=$(BDIR)/CD$$n; \
220- cd $$dir; \
221- find . -follow -type f -print0 | grep -zZ -v "\./md5sum" | \
222- grep -zZ -v "dists/stable" | grep -zZ -v "dists/frozen" | \
223- grep -zZ -v "dists/unstable" | \
224- xargs -0 $(md5sum) > md5sum.txt ; \
225- done \
226- else \
227- $(fastsums) $(BDIR); \
228- fi
229- $(Q)set -e; for dir in $(BDIR)/CD*; do \
230- [ -d "$$dir" ] || continue; \
231- $(hardlink) "$$dir"; \
232- done
233+ $(fastsums) $(BDIR)
234+ $(hardlink) $(BDIR)/CD1
235+
236 src-md5list: ok sources src-secured $(SDIR)/CD1/md5sum.txt
237 $(SDIR)/CD1/md5sum.txt:
238 @echo "Generating md5sum of files from all the source CDs ..."
239@@ -709,14 +636,7 @@ secured: bin-secured src-secured
240 bin-secured: $(BDIR)/secured-stamp
241 $(BDIR)/secured-stamp:
242 @echo "Generating $(CODENAME)-secured on all the binary CDs ..."
243- $(Q)set -e; \
244- for file in $(BDIR)/*.packages; do \
245- dir=$${file%%.packages}; \
246- n=$${dir##$(BDIR)/}; \
247- dir=$(BDIR)/CD$$n; \
248- cd $$dir; \
249- $(add_secured); \
250- done
251+ cd $(BDIR)/CD1 && $(add_secured)
252 $(Q)touch $(BDIR)/secured-stamp
253
254 src-secured: $(SDIR)/secured-stamp
255@@ -738,63 +658,57 @@ images: bin-images src-images
256 bin-images: ok bin-md5list $(OUT)
257 @echo "Generating the binary iso images ..."
258 $(Q)set -e; \
259- for file in $(BDIR)/*.packages; do \
260- dir=$${file%%.packages}; \
261- n=$${dir##$(BDIR)/}; \
262- num=$$n; \
263- dir=$(BDIR)/CD$$n; \
264- cd $$dir/..; \
265- opts=`cat $(BDIR)/$$n.mkisofs_opts`; \
266- volid=`cat $(BDIR)/$$n.volid`; \
267- rm -f $(OUT)/$(call CDBASE,$$n).raw; \
268- if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
269- if [ -d boot$$n/ ]; then \
270- cp -a boot$$n/* CD$$n; \
271- fi; \
272- $(make_vfat_img) -d CD$$n \
273- -o $(OUT)/$(call CDBASE,$$n).raw; \
274- elif [ "$(IMAGE_FORMAT)" = "img" ]; then \
275- $(make_raw_img) -g cd-boot-images/ \
276- -d CD$$n -o $(OUT)/$(call CDBASE,$$n).raw; \
277- elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
278- $(verbose) $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
279- -o $(OUT)/$(call CDBASE,$$n).raw $$opts CD$$n; \
280- chmod +r $(OUT)/$(call CDBASE,$$n).raw; \
281+ cd $(BDIR); \
282+ opts=`cat $(BDIR)/1.mkisofs_opts`; \
283+ volid=`cat $(BDIR)/1.volid`; \
284+ rm -f $(OUT)/$(CDBASE).raw; \
285+ if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
286+ if [ -d boot1/ ]; then \
287+ cp -a boot1/* CD1; \
288 fi; \
289- if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) ]; then \
290- $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) $$n $(BDIR)/CD$$n \
291- $(OUT)/$(call CDBASE,$$n).raw; \
292- elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
293- $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $$n $(BDIR)/CD$$n \
294- $(OUT)/$(call CDBASE,$$n).raw; \
295- fi; \
296- done
297+ $(make_vfat_img) -d CD1 \
298+ -o $(OUT)/$(CDBASE).raw; \
299+ elif [ "$(IMAGE_FORMAT)" = "img" ]; then \
300+ $(make_raw_img) -g cd-boot-images/ \
301+ -d CD1 -o $(OUT)/$(CDBASE).raw; \
302+ elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
303+ $(verbose) $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
304+ -o $(OUT)/$(CDBASE).raw $$opts CD1; \
305+ chmod +r $(OUT)/$(CDBASE).raw; \
306+ fi; \
307+ if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) ]; then \
308+ $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) 1 $(BDIR)/CD1 \
309+ $(OUT)/$(CDBASE).raw; \
310+ elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
311+ $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) 1 $(BDIR)/CD1 \
312+ $(OUT)/$(CDBASE).raw; \
313+ fi;
314 ifeq ($(LIVE_FILESYSTEM),1)
315 -for p in $(LIVEIMAGES)/$(FULLARCH)*.manifest; do \
316 f=`basename $$p`; \
317- cp -a $$p $(OUT)/$(call CDBASE,$$n).`echo $$f|cut -d. -f2-`; \
318+ cp -a $$p $(OUT)/$(CDBASE).`echo $$f|cut -d. -f2-`; \
319 done
320 -if [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-remove ]; then \
321- cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-remove $(OUT)/$(call CDBASE,$$n).manifest-remove; \
322+ cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-remove $(OUT)/$(CDBASE).manifest-remove; \
323 elif [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-desktop ]; then \
324- cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop; \
325+ cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(CDBASE).manifest-desktop; \
326 fi
327 -if [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-minimal-remove ]; then \
328- cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-minimal-remove $(OUT)/$(call CDBASE,$$n).manifest-minimal-remove; \
329+ cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-minimal-remove $(OUT)/$(CDBASE).manifest-minimal-remove; \
330 fi
331 endif
332
333 # FIXME: This only works with CD1, and not with addon CDs.
334 bin-compress_images: ok $(OUT)
335- @if [ ! -e "$(OUT)/$(call CDBASE,1).raw" ]; then \
336+ @if [ ! -e "$(OUT)/$(CDBASE).raw" ]; then \
337 echo "No image for $(FULLARCH)!" >&2; \
338 exit 1; \
339 fi;
340- @file -b $(OUT)/$(call CDBASE,1).raw > $(OUT)/$(call CDBASE,1).type
341- @if ! grep -q '^gzip' $(OUT)/$(call CDBASE,1).type; then \
342+ @file -b $(OUT)/$(CDBASE).raw > $(OUT)/$(CDBASE).type
343+ @if ! grep -q '^gzip' $(OUT)/$(CDBASE).type; then \
344 set -e; \
345- gzip -9 --rsyncable $(OUT)/$(call CDBASE,1).raw; \
346- mv $(OUT)/$(call CDBASE,1).raw.gz $(OUT)/$(call CDBASE,1).raw; \
347+ gzip -9 --rsyncable $(OUT)/$(CDBASE).raw; \
348+ mv $(OUT)/$(CDBASE).raw.gz $(OUT)/$(CDBASE).raw; \
349 fi;
350
351 src-images: ok src-md5list $(OUT)
352@@ -827,43 +741,6 @@ pi-makelist:
353 fi \
354 done
355
356-# Generate only one image number $(CD)
357-image: bin-image
358-bin-image: ok bin-md5list $(OUT)
359- @echo "Generating the binary iso image n�$(CD) ..."
360- @test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
361- set -e; cd $(BDIR); opts=`cat $(CD).mkisofs_opts`; \
362- volid=`cat $(CD).volid`; \
363- rm -f $(OUT)/$(call CDBASE,$(CD)).raw; \
364- if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
365- if [ -d boot$(CD)/ ]; then \
366- cp -a boot$(CD)/* CD$(CD); \
367- fi; \
368- $(make_vfat_img) -d CD$(CD) -o $(OUT)/$(call CDBASE,$(CD)).raw; \
369- elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
370- $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
371- -o $(OUT)/$(call CDBASE,$(CD)).raw $$opts CD$(CD); \
372- chmod +r $(OUT)/$(call CDBASE,$(CD)).raw; \
373- fi; \
374- if [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) ]; then \
375- $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(FULLARCH) $(CD) $(BDIR)/CD$(CD) \
376- $(OUT)/$(call CDBASE,$(CD)).raw; \
377- elif [ -f $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) ]; then \
378- $(BASEDIR)/tools/boot/$(DI_CODENAME)/post-boot-$(ARCH) $(CD) $(BDIR)/CD$(CD) \
379- $(OUT)/$(call CDBASE,$(CD)).raw; \
380- fi
381-
382-src-image: ok src-md5list $(OUT)
383- @echo "Generating the source iso image n�$(CD) ..."
384- @test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
385- set -e; cd $(SDIR); opts=`cat $(CD).mkisofs_opts`; \
386- volid=`cat $(CD).volid`; \
387- rm -f $(OUT)/$(call CDSRCBASE,$(CD)).raw; \
388- $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
389- -o $(OUT)/$(call CDSRCBASE,$(CD)).raw $$opts CD$(CD); \
390- chmod +r $(OUT)/$(call CDSRCBASE,$(CD)).raw
391-
392-
393 #Calculate the md5sums for the images (if available), or get from templates
394 imagesums:
395 $(Q)cd $(OUT); :> MD5SUMS; :> SHA1SUMS; for file in `find * -name \*.raw`; do \
396diff --git a/tools/list2cds b/tools/list2cds
397index 64506fc..d8b17e3 100755
398--- a/tools/list2cds
399+++ b/tools/list2cds
400@@ -22,7 +22,7 @@ my $exclude = "$list.exclude";
401 my $nodepends = $ENV{'NODEPENDS'} || 0;
402 my $norecommends = $ENV{'NORECOMMENDS'} || 0;
403 my $nosuggests = $ENV{'NOSUGGESTS'} || 1;
404-my $maxcds = $ENV{'MAXCDS'} || 0;
405+my $maxcds = 1;
406 my $overflowbincds = $ENV{'OVERFLOWBINCDS'} || 1;
407
408 my $apt = "$ENV{'BASEDIR'}/tools/apt-selection";
409@@ -288,7 +288,7 @@ foreach (glob("$dir/*.packages")) {
410 # Now write the lists down
411 my $numcds=0;
412 foreach (sort { $a <=> $b } keys %cds) {
413- if ($maxcds && $numcds+1 > $maxcds) {
414+ if ($maxcds && $numcds+1 > 1) {
415 msg(0, "Stopping at CD $numcds\n");
416 last;
417 }

Subscribers

People subscribed via source and target branches