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

Pass the base mkisofs options into make_disc_trees too.

This commit is contained in:
Steve McIntyre 2010-11-27 18:28:45 +00:00
parent f240c389a7
commit e7e5fec52f
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -363,7 +363,7 @@ image-trees: ok genlist
$(Q)if [ "$(INC_SOURCE)"x = "yes"x ] ; then \
grep ^source $(BDIR)/packages > $(BDIR)/packages.source; \
fi
$(Q)$(BASEDIR)/tools/make_disc_trees.pl $(BASEDIR) $(MIRROR) $(TDIR) $(CODENAME) "$(ARCHES)" $(MKISOFS)
$(Q)$(BASEDIR)/tools/make_disc_trees.pl $(BASEDIR) $(MIRROR) $(TDIR) $(CODENAME) "$(ARCHES)" "$(MKISOFS)" "$(MKISOFS_OPTS)"
images: ok $(OUT) $(BDIR)/md5-check
$(Q)$(make_image) "$(BDIR)" "$(ARCHES)" "$(OUT)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)"

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
debian-cd (3.1.5) UNRELEASED; urgency=low
[ Steve McIntyre ]
* Pass the base mkisofs options into make_disc_trees too.
-- Steve McIntyre <93sam@debian.org> Sun, 14 Nov 2010 15:37:24 +0000
debian-cd (3.1.4) unstable; urgency=low
[ Frans Pop ]

5
tools/make_disc_trees.pl
View File

@ -14,6 +14,7 @@ use Compress::Zlib;
my %pkginfo;
my ($basedir, $mirror, $tdir, $codename, $archlist, $mkisofs, $maxcds,
$maxisos, $maxjigdos, $extranonfree);
my $mkisofs_base_opts = "";
my $mkisofs_opts = "";
my $mkisofs_dirs = "";
my (@arches, @arches_nosrc, @overflowlist, @pkgs_added);
@ -31,6 +32,7 @@ $tdir = shift;
$codename = shift;
$archlist = shift;
$mkisofs = shift;
$mkisofs_base_opts = shift;
my $security = $ENV{'SECURITY'} || $mirror;
my $localdebs = $ENV{'LOCALDEBS'} || $mirror;
@ -133,7 +135,7 @@ my $pkgs_done = 0;
my $size = 0;
my $guess_size = 0;
my @overflowpkg;
my $mkisofs_check = "$mkisofs -r -print-size -quiet";
my $mkisofs_check = "$mkisofs $mkisofs_base_opts -r -print-size -quiet";
my $debootstrap_script = "";
if (defined ($ENV{'DEBOOTSTRAP_SCRIPT'})) {
$debootstrap_script = $ENV{'DEBOOTSTRAP_SCRIPT'};
@ -268,6 +270,7 @@ while (defined (my $pkg = <INLIST>)) {
(($size > $size_swap_check) &&
($count_since_last_check > $size_check_period))) {
$count_since_last_check = 0;
print LOG "Running $size_check $cddir\n";
$size = `$size_check $cddir`;
chomp $size;
print LOG "CD $disknum: Real current size is $size blocks after adding $pkg\n";