Re: debian-cd 2.2.13 and woody.
[Raphael Hertzog]
I agree with you. Would you like to commit it ? But please, do the
required changes to CONF.sh and debian/CONF.sh in the same time.
Yes, please commit it. I do not have write access to the CVS. Here
is a new patch including changes to debian/CONF.sh. The same changes
should be done to CONF.sh. Why are there two files with almost the
same content?
Index: debian/CONF.sh
===
RCS file: /var/lib/cvs/skolelinux/src/debian-cd/debian/CONF.sh,v
retrieving revision 1.1.1.4
diff -u -3 -p -u -r1.1.1.4 CONF.sh
--- debian/CONF.sh 11 Feb 2002 16:44:32 - 1.1.1.4
+++ debian/CONF.sh 23 Mar 2002 23:35:52 -
@@ -14,6 +14,7 @@ unset MKISOFS_OPTS
unset EXCLUDE
unset SRCEXCLUDE
unset NORECOMMENDS
+unset NOSUGGESTS
unset DOJIGDO
unset JIGDOCMD
unset JIGDOTEMPLATEURL
@@ -119,9 +120,13 @@ export APTTMP=/home/ftp/tmp/apt
# We also exclude some source packages
#export SRCEXCLUDE=$BASEDIR/tasks/exclude-src-potato
-# Set this if only the required (and NOT the recommended/suggested) packages
-# should be added on CDs when a package is added on the CD.
+# Set this if the recommended packages should be skipped when adding
+# package on the CD. The default is 'false'.
#export NORECOMMENDS=1
+
+# Set this if the suggested packages should be skipped when adding
+# package on the CD. The default is 'true'.
+#export NOSUGGESTS=1
# Produce jigdo files:
# 0/unset = Don't do jigdo at all, produce only the full iso image.
Index: tools/list2cds
===
RCS file: /var/lib/cvs/skolelinux/src/debian-cd/tools/list2cds,v
retrieving revision 1.1.1.2
retrieving revision 1.6
diff -u -3 -p -u -r1.1.1.2 -r1.6
--- tools/list2cds 7 Jan 2002 13:13:45 - 1.1.1.2
+++ tools/list2cds 17 Mar 2002 08:21:27 - 1.6
@@ -22,6 +22,7 @@ my $local = $ENV{'LOCAL'} || 0;
my $complete = $ENV{'COMPLETE'} || 0;
my $exclude = $ENV{'EXCLUDE'} || $list.exclude;
my $norecommends = $ENV{'NORECOMMENDS'} || 0;
+my $nosuggests = $ENV{'NOSUGGESTS'} || 1;
my $apt = $ENV{'BASEDIR'}/tools/apt-selection;
my $adir = $ENV{'APTTMP'}/$ENV{'CODENAME'}-$ENV{'ARCH'};
@@ -192,7 +193,7 @@ while (defined($_=LIST)) {
msg(3, $_ has already been included.\n);
next;
}
- add_package ($_, ! $norecommends);
+ add_package ($_, ! $norecommends, ! $nosuggests);
}
close LIST;
@@ -207,7 +208,7 @@ if ($complete) {
foreach $p (sort { ($packages{$a}{Section} cmp $packages{$b}{Section})
|| ($a cmp $b) }
grep { not ($included{$_} or $excluded{$_}) } keys %packages) {
- add_package ($p, 0);
+ add_package ($p, 0, 0);
}
}
msg(0, CD $cd will only be filled with $cd_size bytes ...\n);
@@ -233,7 +234,7 @@ if ($extranonfree and (! $nonfree))
# Include non-free packages
foreach $p (@toinclude)
{
- add_package($p, 1);
+ add_package($p, 1, 1);
}
# If a contrib package was listed in the list of packages to
@@ -251,7 +252,7 @@ if ($extranonfree and (! $nonfree))
(ignored)\n);
next;
}
- add_package ($_, 1);
+ add_package ($_, 1, 1);
}
close LIST;
@@ -264,7 +265,7 @@ if ($extranonfree and (! $nonfree))
grep { not ($included{$_} or $excluded{$_}) }
keys %packages)
{
- add_package ($p, 0);
+ add_package ($p, 0, 0);
}
}
@@ -409,7 +410,8 @@ sub read_virtualdepends {
sub add_package {
my $p = shift;
- my $add_rec = shift; # Do we look for recommends/suggests
+ my $add_rec = shift; # Do we look for recommends
+ my $add_sug = shift; # Do we look for suggests
msg(2, + Trying to add $p...\n);
if ($included{$p}) {
@@ -438,8 +440,8 @@ sub add_package {
msg(3, \@dep after checklist = @dep\n);
if ($add_rec) {
- #TODO: Look for recommends suggests (not yet included !!)
- add_suggests (\@dep);
+ #TODO: Look for recommends (not yet included !!)
+ add_recommends (\@dep);
# Check again but doesn't fail if one of the package cannot be
# installed, just ignore it (it will be removed from @dep)
if (not check_list (\@dep, 0)) {
@@ -449,6 +451,18 @@ sub add_package {
msg(3, \@dep after checklist2 = @dep\n);
}
+ if ($add_sug) {
+ #TODO: Look for suggests (not yet included !!)
+ add_suggests (\@dep);
+ # Check again but doesn't fail if one of the package cannot be
+ # installed, just ignore it (it will be removed from @dep)
+ if (not check_list (\@dep, 0)) {
+
Re: debian-cd 2.2.13 and woody.
Le Mon, Mar 18, 2002 at 09:15:34AM +0100, Petter Reinholdtsen écrivait: Now it is tested, and it worked just fine. Note that the default value for NOSUGGESTS is true, not false as with NORECOMMENDS. If I remember correctly, dselect handles recommends as depends, but ignores suggests. I thus believe it is more important to include recommonds. I agree with you. Would you like to commit it ? But please, do the required changes to CONF.sh and debian/CONF.sh in the same time. Cheers, -- Raphaël Hertzog -+- http://strasbourg.linuxfr.org/~raphael/ Formation Linux et logiciel libre : http://www.logidee.com -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
[Philip Charles]
Should list2cds be hacked to include a NOSUGGESTS option?
Possibly. :-) Here is an untested patch.
Index: tools/list2cds
===
RCS file: /var/lib/cvs/skolelinux/src/debian-cd/tools/list2cds,v
retrieving revision 1.5
diff -u -3 -p -u -r1.5 list2cds
--- tools/list2cds 7 Jan 2002 12:19:55 - 1.5
+++ tools/list2cds 17 Mar 2002 08:19:48 -
@@ -22,6 +22,7 @@ my $local = $ENV{'LOCAL'} || 0;
my $complete = $ENV{'COMPLETE'} || 0;
my $exclude = $ENV{'EXCLUDE'} || $list.exclude;
my $norecommends = $ENV{'NORECOMMENDS'} || 0;
+my $nosuggests = $ENV{'NOSUGGESTS'} || 1;
my $apt = $ENV{'BASEDIR'}/tools/apt-selection;
my $adir = $ENV{'APTTMP'}/$ENV{'CODENAME'}-$ENV{'ARCH'};
@@ -192,7 +193,7 @@ while (defined($_=LIST)) {
msg(3, $_ has already been included.\n);
next;
}
- add_package ($_, ! $norecommends);
+ add_package ($_, ! $norecommends, ! $nosuggests);
}
close LIST;
@@ -207,7 +208,7 @@ if ($complete) {
foreach $p (sort { ($packages{$a}{Section} cmp $packages{$b}{Section})
|| ($a cmp $b) }
grep { not ($included{$_} or $excluded{$_}) } keys %packages) {
- add_package ($p, 0);
+ add_package ($p, 0, 0);
}
}
msg(0, CD $cd will only be filled with $cd_size bytes ...\n);
@@ -233,7 +234,7 @@ if ($extranonfree and (! $nonfree))
# Include non-free packages
foreach $p (@toinclude)
{
- add_package($p, 1);
+ add_package($p, 1, 1);
}
# If a contrib package was listed in the list of packages to
@@ -251,7 +252,7 @@ if ($extranonfree and (! $nonfree))
(ignored)\n);
next;
}
- add_package ($_, 1);
+ add_package ($_, 1, 1);
}
close LIST;
@@ -264,7 +265,7 @@ if ($extranonfree and (! $nonfree))
grep { not ($included{$_} or $excluded{$_}) }
keys %packages)
{
- add_package ($p, 0);
+ add_package ($p, 0, 0);
}
}
@@ -409,7 +410,8 @@ sub read_virtualdepends {
sub add_package {
my $p = shift;
- my $add_rec = shift; # Do we look for recommends/suggests
+ my $add_rec = shift; # Do we look for recommends
+ my $add_sug = shift; # Do we look for suggests
msg(2, + Trying to add $p...\n);
if ($included{$p}) {
@@ -438,8 +440,8 @@ sub add_package {
msg(3, \@dep after checklist = @dep\n);
if ($add_rec) {
- #TODO: Look for recommends suggests (not yet included !!)
- add_suggests (\@dep);
+ #TODO: Look for recommends (not yet included !!)
+ add_recommends (\@dep);
# Check again but doesn't fail if one of the package cannot be
# installed, just ignore it (it will be removed from @dep)
if (not check_list (\@dep, 0)) {
@@ -449,6 +451,18 @@ sub add_package {
msg(3, \@dep after checklist2 = @dep\n);
}
+ if ($add_sug) {
+ #TODO: Look for suggests (not yet included !!)
+ add_suggests (\@dep);
+ # Check again but doesn't fail if one of the package cannot be
+ # installed, just ignore it (it will be removed from @dep)
+ if (not check_list (\@dep, 0)) {
+ msg(0, UNEXPECTED: It shouldn't fail here !\n);
+ return;
+ }
+ msg(3, \@dep after checklist3 = @dep\n);
+ }
+
# All packages are ok, now check for the size issue
$size = get_size (\@dep);
@@ -483,8 +497,18 @@ sub add_suggests {
my @copy = @{$list}; # A copy is needed since I'll modify the array
foreach $p (@copy) {
- add_missing($list, $packages{$p}{Recommends});
add_missing($list, $packages{$p}{Suggests});
+ }
+
+}
+
+sub add_recommends {
+ my $list = shift;
+ my $p; # = shift;
+ my @copy = @{$list}; # A copy is needed since I'll modify the array
+
+ foreach $p (@copy) {
+ add_missing($list, $packages{$p}{Recommends});
}
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
[Petter Reinholdtsen] Possibly. :-) Here is an untested patch. Now it is tested, and it worked just fine. Note that the default value for NOSUGGESTS is true, not false as with NORECOMMENDS. If I remember correctly, dselect handles recommends as depends, but ignores suggests. I thus believe it is more important to include recommonds. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
On Sat, 16 Mar 2002, Chris Lawrence wrote: That's a bit of a head-scratcher, as I had no trouble getting all of games and junior on CD 1. Granted, I was using 700MB as my blank size, rather than 650MB. Do you have including of suggestions disabled? Also, is basedebs.tar being stuck (needlessly) on your CD #1? I am rather unhappy about using 700MB media as many people use old hardware for their first installation. No basedebs.tar, but multiboot. I took a look at list2cds and discovered a YAUO (yet another undocumented option) NORECOMMENDS. Is this what you meant? IMO this is a rather violent option. Should list2cds be hacked to include a NOSUGGESTS option? Anyway I will try a YAB (yet another build) with the NORECOMMEDS enabled. Phil. -- Philip Charles; 39a Paterson Street, Abbotsford, Dunedin, New Zealand +64 3 488 2818Fax +64 3 488 2875Mobile 025 267 9420 [EMAIL PROTECTED] - preferred. [EMAIL PROTECTED] I sell GNU/Linux GNU/Hurd CDs. See http://www.copyleft.co.nz -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
[Philip Charles] If I get time I will work out how much space the packages for each task takes. I've made such script already. It is not perfect, but it give a number close to the real value. It currently calculates the disk space used when installing a task, but it should be easy to modify it to use the package size instead. It is available from URL:http://developer.skolelinux.no/cgi-bin/viewcvs.cgi/skolelinux/src/task-skolelinux/tools/pkgdisksize. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
On Mar 16, Philip Charles wrote: On Sat, 16 Mar 2002, Chris Lawrence wrote: That's a bit of a head-scratcher, as I had no trouble getting all of games and junior on CD 1. Granted, I was using 700MB as my blank size, rather than 650MB. Do you have including of suggestions disabled? Also, is basedebs.tar being stuck (needlessly) on your CD #1? I am rather unhappy about using 700MB media as many people use old hardware for their first installation. No basedebs.tar, but multiboot. True, it's probably best that the official CDs fit on 650MB media. Especially since CD-RW media doesn't seem as available in the 700MB size. I took a look at list2cds and discovered a YAUO (yet another undocumented option) NORECOMMENDS. Is this what you meant? IMO this is a rather violent option. Should list2cds be hacked to include a NOSUGGESTS option? Probably; at least, that's what I did in my rewritten script (list2cds-cram; unfortunately, it's not a drop-in replacement, which is why I haven't stuck it in CVS). I usually build with just depends and recommends honored, though I've been experimenting with code to avoid recursive suggestion inclusion (suggested packages don't need to pull in THEIR suggestions too, otherwise you get a really dense graph really quickly... debconf will pull in half of GNOME if you let the suggestions get away from you). I also hacked in code to allow treating doc packages that are suggested or recommended as dependencies for purposes of building the CD. Anyway I will try a YAB (yet another build) with the NORECOMMEDS enabled. That should free up a TON of space. I probably should tar up my hacks as inserted atop debian-cd CVS; at the moment, they just sort of sit in a directory on the lordsutch.com website. (http://www.lordsutch.com/cds/debian-cd/hacks.html for details.) Chris -- Chris Lawrence [EMAIL PROTECTED] - http://www.lordsutch.com/chris/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
On Sat, 16 Mar 2002, Chris Lawrence wrote: True, it's probably best that the official CDs fit on 650MB media. Especially since CD-RW media doesn't seem as available in the 700MB size. *** Probably; at least, that's what I did in my rewritten script (list2cds-cram; unfortunately, it's not a drop-in replacement, which is why I haven't stuck it in CVS). I usually build with just depends and recommends honored, though I've been experimenting with code to avoid recursive suggestion inclusion (suggested packages don't need to pull in THEIR suggestions too, otherwise you get a really dense graph really quickly... debconf will pull in half of GNOME if you let the suggestions get away from you). I also hacked in code to allow treating doc packages that are suggested or recommended as dependencies for purposes of building the CD. Anyway I will try a YAB (yet another build) with the NORECOMMEDS enabled. That should free up a TON of space. Saved some, but not as much as expected. What was the big space saver was removing #include xservers-XFree3 #include interesting-redhat #include interesting-fromcd23 #include linuxtag2000 This dropped the size of the minimal first CD from 580 MB to 343MB, freeing up 237MB. No wonder your 700MB images made a difference. I probably should tar up my hacks as inserted atop debian-cd CVS; at the moment, they just sort of sit in a directory on the lordsutch.com website. (http://www.lordsutch.com/cds/debian-cd/hacks.html for details.) At the moment I am finding the amount of space each task takes on a CD. Phil. -- Philip Charles; 39a Paterson Street, Abbotsford, Dunedin, New Zealand +64 3 488 2818Fax +64 3 488 2875Mobile 025 267 9420 [EMAIL PROTECTED] - preferred. [EMAIL PROTECTED] I sell GNU/Linux GNU/Hurd CDs. See http://www.copyleft.co.nz -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
On 16 Mar 2002, Petter Reinholdtsen wrote: [Philip Charles] If I get time I will work out how much space the packages for each task takes. I've made such script already. It is not perfect, but it give a number close to the real value. It currently calculates the disk space used when installing a task, but it should be easy to modify it to use the package size instead. It is available from URL:http://developer.skolelinux.no/cgi-bin/viewcvs.cgi/skolelinux/src/task-skolelinux/tools/pkgdisksize. Thanks, but I have already started. I discovered that there were nasty complications in the form of meta packages, particulaly in Task: junior, and other packages are dragged onto the CDs because of dependencies. So I have decided to make life easy for myself and I am building CD file-trees which only have one task on them. I will post the results in an hour or so. Phil. -- Philip Charles; 39a Paterson Street, Abbotsford, Dunedin, New Zealand +64 3 488 2818Fax +64 3 488 2875Mobile 025 267 9420 [EMAIL PROTECTED] - preferred. [EMAIL PROTECTED] I sell GNU/Linux GNU/Hurd CDs. See http://www.copyleft.co.nz -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
On Fri, 15 Mar 2002, Chris Lawrence wrote: The script in debian-cd is erroneous, and only picks up the names of tasks with hyphens in them; I fixed it in CVS a few days back. The list should now be correct, too. I picked up the list from cvs a few minutes ago. I see that it is in alphabetical order. Unfortunately this means that packages for the various tasks will be scattered over the first two CDs. I can get all of the non-i18n tasks on CD 1 and have space left over for lots of interesting packages. My gut feeling is that the i18n tasks can either be on CD #2, or a separate woody-i18n set with some of the other tasks dropped from CD #1 may be appropriate. I carefully built task-woody so that packages for each task were grouped together in the list. All the packages for basic-desktop, desktop, laptop, dialup, and print-server are on the first CD. games and junior are split between the first and second CDs. All the other tasks are on the second CD. The following CDs are clear of Task: foo packages. As an alternative, I think if you dropped the non-Western European language tasks (which pull in a lot of fonts and other big packages) you could still have a decent #1 CD; the ISO-8851-1/15 language tasks don't bring in a lot of stuff (dictionaries, mainly). But I haven't tried this. As it stands, the *-servers (excluding print), *-dev, tex, i18n and a few others have been forced onto the 2nd CD. gnome and kde must take up a considerable amount of space on the first CD. If I get time I will work out how much space the packages for each task takes. Phil. -- Philip Charles; 39a Paterson Street, Abbotsford, Dunedin, New Zealand +64 3 488 2818Fax +64 3 488 2875Mobile 025 267 9420 [EMAIL PROTECTED] - preferred. [EMAIL PROTECTED] I sell GNU/Linux GNU/Hurd CDs. See http://www.copyleft.co.nz -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: debian-cd 2.2.13 and woody.
On Mar 16, Philip Charles wrote: I carefully built task-woody so that packages for each task were grouped together in the list. All the packages for basic-desktop, desktop, laptop, dialup, and print-server are on the first CD. games and junior are split between the first and second CDs. All the other tasks are on the second CD. The following CDs are clear of Task: foo packages. That's a bit of a head-scratcher, as I had no trouble getting all of games and junior on CD 1. Granted, I was using 700MB as my blank size, rather than 650MB. Do you have including of suggestions disabled? Also, is basedebs.tar being stuck (needlessly) on your CD #1? Chris -- Chris Lawrence [EMAIL PROTECTED] - http://www.lordsutch.com/chris/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
