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

* Make the log output more consistent. 

* Offer the possibilty to not force the inclusion of recommended/suggested packages.
This commit is contained in:
Raphaël Hertzog 2002-01-07 10:31:23 +00:00
parent 8385e85d6a
commit 718da6a3cc
4 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONF.sh
View File

@ -17,6 +17,7 @@ unset MKISOFS
unset MKISOFS_OPTS
unset EXCLUDE
unset SRCEXCLUDE
unset NORECOMMENDS
# The debian-cd dir
@ -119,3 +120,7 @@ export APTTMP=/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.
#export NORECOMMENDS=1

5
debian/CONF.sh vendored
View File

@ -13,6 +13,7 @@ unset MKISOFS
unset MKISOFS_OPTS
unset EXCLUDE
unset SRCEXCLUDE
unset NORECOMMENDS
# The debian-cd dir
export BASEDIR=/usr/share/debian-cd
@ -113,3 +114,7 @@ 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.
#export NORECOMMENDS=1

4
debian/changelog vendored
View File

@ -3,6 +3,10 @@ debian-cd (2.2.12) unstable; urgency=low
* UNRELEASED.
* Get it right this time with the MULTIBOOT test ... Closes: #127234
* Correct spelling mistake in README.devel. Closes: #127726
* Make the log output more consistent and offer the possibility
to not force the inclusion of recommended/suggested packages.
Thanks to Petter Reinholdtsen for the patches.
Closes: #127964, #127968
-- Raphael Hertzog <hertzog@debian.org> Sat, 29 Dec 2001 19:57:23 +0100

32
tools/list2cds
View File

@ -21,6 +21,7 @@ my $forcenonusoncd1 = $ENV{'FORCENONUSONCD1'} || 0;
my $local = $ENV{'LOCAL'} || 0;
my $complete = $ENV{'COMPLETE'} || 0;
my $exclude = $ENV{'EXCLUDE'} || "$list.exclude";
my $norecommends = $ENV{'NORECOMMENDS'} || 0;
my $apt = "$ENV{'BASEDIR'}/tools/apt-selection";
my $adir = "$ENV{'APTTMP'}/$ENV{'CODENAME'}-$ENV{'ARCH'}";
@ -143,10 +144,9 @@ while (defined($_ = <STATUS>)) {
next;
}
next if $excluded{$p};
$cd_size += $packages{$p}{"Size"};
$total_size += $packages{$p}{"Size"};
$included{$p} = 1;
add_to_cd (1, [ $p ]);
msg(2, "+ Trying to add $p...\n");
my $size = $packages{$p}{"Size"};
add_to_cd (1, $size, [ $p ]);
}
close STATUS;
msg(0, " Standard system already takes $cd_size bytes on the first CD.\n");
@ -192,7 +192,7 @@ while (defined($_=<LIST>)) {
msg(3, "$_ has already been included.\n");
next;
}
add_package ($_, 1);
add_package ($_, ! $norecommends);
}
close LIST;
@ -466,17 +466,7 @@ sub add_package {
unexclude ($cd);
}
msg(2, " \$cd_size = $cd_size, \$size = $size\n");
$cd_size += $size;
$total_size += $size;
add_to_cd ($cd, \@dep);
# Mark the packages included
foreach (@dep) {
$included{$_} = $cd;
}
add_to_cd ($cd, $size, \@dep);
}
sub accepted {
@ -633,7 +623,17 @@ sub check_list {
# Add packages to the current CD number $cd
sub add_to_cd {
my $cd = shift;
my $size = shift;
my $ref = shift;
msg(2, " \$cd_size = $cd_size, \$size = $size\n");
$cd_size += $size;
$total_size += $size;
foreach my $pkg (@{$ref}) {
$included{$pkg} = $cd;
}
$cds{$cd} = [] if not ref $cds{$cd};
msg(2, " Adding @{$ref} to CD $cd ...\n");
push(@{$cds{$cd}}, @{$ref});