[debian-edu-commits] r80972 - trunk/src/build/CD-administrator

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-20 21:05:12 +0000 (Thu, 20 Jun 2013)
New Revision: 80972

Modified:
   trunk/src/build/CD-administrator/CONF-wheezy-i386-dvd.sh
   trunk/src/build/CD-administrator/debian-cd.patch.wheezy
Log:
Switch DVD build to use DISKTYPE=DVD and patch debian-cd to reduce the size, to get a sensible .disk/cd_type value on the ISO.

Modified: trunk/src/build/CD-administrator/CONF-wheezy-i386-dvd.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-wheezy-i386-dvd.sh	2013-06-20 21:02:53 UTC (rev 80971)
+++ trunk/src/build/CD-administrator/CONF-wheezy-i386-dvd.sh	2013-06-20 21:05:12 UTC (rev 80972)
@@ -199,13 +199,7 @@
 # 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=DVD
-export DISKTYPE=CUSTOM
-export CUSTOMSIZE=XXXX
-# Default for DVD is 4700 MB, ie 2294921 blocks.  Reducing it slightly to make
-# sure the image fit on DVD disks reported by Bjarne Nielsen.  ISO should be
-# smaller than 4700000000 bytes.
-export CUSTOMSIZE=2291504 # 4694 MB
+export DISKTYPE=DVD
 
 # List of languages for which language tasks from tasksel should be
 # included. See tasks/README.tasksel for further info.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.wheezy
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.wheezy	2013-06-20 21:02:53 UTC (rev 80971)
+++ trunk/src/build/CD-administrator/debian-cd.patch.wheezy	2013-06-20 21:05:12 UTC (rev 80972)
@@ -142,3 +142,17 @@
  			}
  			remove_entry(lc $_, $list);
  			push @{$list}, lc $_;
+--- debian-cd.unpatched.wheezy//tools/make_disc_trees.pl	2013-06-17 22:55:07.000000000 +0200
++++ debian-cd/tools/make_disc_trees.pl	2013-06-20 23:00:22.000000000 +0200
+@@ -714,7 +714,10 @@
+         $maxdiskblocks = int(737 * $MB / $blocksize) - $reserved;
+         $diskdesc = "700MiB CD";
+     } elsif ($chosen_disk eq "DVD") {
+-        $maxdiskblocks = int(4700 * $MB / $blocksize) - $reserved;
++# Default for DVD is 4700 MB, ie 2294921 blocks.  Reducing it slightly to make
++# sure the image fit on DVD disks reported by Bjarne Nielsen.  ISO should be
++# smaller than 4700000000 bytes.
++        $maxdiskblocks = int(4694 * $MB / $blocksize) - $reserved;
+         $diskdesc = "4.7GB DVD";
+     } elsif ($chosen_disk eq "DLDVD") {
+         $maxdiskblocks = int(8500 * $MB / $blocksize) - $reserved;