* Add support for dual-layer DVD, Blu-Ray and dual-layer Blu-Ray

discs. Nothing special, just extra sizes recognised.
This commit is contained in:
Steve McIntyre 2008-06-28 14:08:41 +00:00
parent 50b9093086
commit 71039d6ead
4 changed files with 21 additions and 2 deletions

View File

@ -168,6 +168,9 @@ ATTEMPT_FALLBACK=yes
# CD: standard 74-min CD (650 MiB)
# CD700: (semi-)standard 80-min CD (700 MiB)
# DVD: standard 4.7 GB DVD
# DLDVD: standard 8.5 GB dual-layer DVD
# BD: standard 25 GB blu-ray
# DLBD: standard 50 GB dual-layer blu-ray
# CUSTOM: up to you - specify a size to go with it (in 2K blocks)
export DISKTYPE=CD
#export DISKTYPE=CUSTOM

5
debian/CONF.sh vendored
View File

@ -45,7 +45,7 @@ unset MAXCDS || true
unset SPLASHPNG || true
unset OMIT_MANUAL || true
unset OMIT_RELEASE_NOTES || true
unset OMIT_DOC_TOOLS || true
unset OMIT_DOC_TOOLS || true
# The debian-cd dir
# Where I am (hoping I'm in the debian-cd dir)
@ -168,6 +168,9 @@ ATTEMPT_FALLBACK=yes
# CD: standard 74-min CD (650 MiB)
# CD700: (semi-)standard 80-min CD (700 MiB)
# DVD: standard 4.7 GB DVD
# DLDVD: standard 8.5 GB dual-layer DVD
# BD: standard 25 GB blu-ray
# DLBD: standard 50 GB dual-layer blu-ray
# CUSTOM: up to you - specify a size to go with it (in 2K blocks)
export DISKTYPE=CD
#export DISKTYPE=CUSTOM

2
debian/changelog vendored
View File

@ -55,6 +55,8 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
[ Steve McIntyre ]
* tools/make-firmware-image: Simple script to create .tar.gz and
.zip files containing non-free firmware and microcode packages.
* Add support for dual-layer DVD, Blu-Ray and dual-layer Blu-Ray
discs. Nothing special, just extra sizes recognised.
-- Frans Pop <fjp@debian.org> Fri, 06 Jun 2008 22:32:06 +0200

View File

@ -492,7 +492,18 @@ sub get_disc_size {
$diskdesc = "700MiB CD";
} elsif ($disktype eq "DVD") {
$maxdiskblocks = int(4700 * $MB / $blocksize) - $reserved;
$diskdesc = "4.7GB CD";
$diskdesc = "4.7GB DVD";
} elsif ($disktype eq "DLDVD") {
$maxdiskblocks = int(8500 * $MB / $blocksize) - $reserved;
$diskdesc = "8.5GB DVD";
} elsif ($disktype eq "BD") {
# Useable capacity, found by checking some disks
$maxdiskblocks = 11826000 - $reserved;
$diskdesc = "25GB BD";
} elsif ($disktype eq "DLBD") {
# Useable capacity, found by checking some disks
$maxdiskblocks = 23652352 - $reserved;
$diskdesc = "50GB DLBD";
} elsif ($disktype eq "CUSTOM") {
$maxdiskblocks = $ENV{'CUSTOMSIZE'} - $reserved ||
die "Need to specify a custom size for the CUSTOM disktype\n";