From 42583ba7b4af977869bd17abef3faf4419ce69f3 Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Mon, 27 Nov 2006 03:19:31 +0000 Subject: [PATCH] * Stop using the silly .raw extension for output images, use .iso instead * Improve support for different disk types. Specify DISKTYPE in CONF.sh, and it will affect both the output name later (so it's now possible to distinguish between CDs and DVDs). Defaults to CD if not otherwise set. DISKTYPE will be used more in the future for sizing too, but that merge can wait a while longer yet. Closes: #361422 * Use DISKTYPE and COMPLETE values to create the file .disk/cd_type for the installer to use. --- CONF.sh | 7 +++++++ Makefile | 8 ++++---- debian/CONF.sh | 7 +++++++ debian/changelog | 8 ++++++++ tools/add_debs | 10 ++++++++++ tools/make_image | 14 +++++++------- 6 files changed, 43 insertions(+), 11 deletions(-) diff --git a/CONF.sh b/CONF.sh index f6a2fc34..54e49dc8 100644 --- a/CONF.sh +++ b/CONF.sh @@ -178,6 +178,13 @@ ATTEMPT_FALLBACK=yes export DEFBINSIZE=630 export DEFSRCSIZE=635 +# Set the disk type, used later in various places. Soon this will also +# be used to work out the disk size automatically +if [ "$DISKTYPE"x = ""x ] ; then + DISKTYPE=CD +fi +export DISKTYPE + # We don't want certain packages to take up space on CD1... #export EXCLUDE="$BASEDIR"/tasks/exclude-$CODENAME # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x) diff --git a/Makefile b/Makefile index 027af71a..8b0e7dad 100755 --- a/Makefile +++ b/Makefile @@ -26,17 +26,17 @@ ifndef CAPCODENAME CAPCODENAME:=$(shell perl -e "print ucfirst("$(CODENAME)")") endif ifndef BINDISKINFO -export BINDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(ARCH) Binary-$$num $(BUILD_DATE)" +export BINDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) $(ARCH) Binary-$$num $(BUILD_DATE)" endif ifndef SRCDISKINFO -export SRCDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num $(BUILD_DATE)" +export SRCDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) Source-$$num $(BUILD_DATE)" endif # ND=No-Date versions for README ifndef BINDISKINFOND -export BINDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(ARCH) Binary-$$num" +export BINDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) $(ARCH) Binary-$$num" endif ifndef SRCDISKINFOND -export SRCDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num" +export SRCDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) Source-$$num" endif ifndef BINVOLID ifeq ($(ARCH),powerpc) diff --git a/debian/CONF.sh b/debian/CONF.sh index f6a2fc34..54e49dc8 100644 --- a/debian/CONF.sh +++ b/debian/CONF.sh @@ -178,6 +178,13 @@ ATTEMPT_FALLBACK=yes export DEFBINSIZE=630 export DEFSRCSIZE=635 +# Set the disk type, used later in various places. Soon this will also +# be used to work out the disk size automatically +if [ "$DISKTYPE"x = ""x ] ; then + DISKTYPE=CD +fi +export DISKTYPE + # We don't want certain packages to take up space on CD1... #export EXCLUDE="$BASEDIR"/tasks/exclude-$CODENAME # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x) diff --git a/debian/changelog b/debian/changelog index 51ea01d6..55224666 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,14 @@ debian-cd (2.2.26) UNRELEASED; urgency=low for the boot-$arch scripts to use rather than simply appending to the $N.mkisofs_opts file directly. Needed for forthcoming multi-arch support. + * Stop using the silly .raw extension for output images, use .iso instead + * Improve support for different disk types. Specify DISKTYPE in CONF.sh, + and it will affect both the output name later (so it's now possible to + distinguish between CDs and DVDs). Defaults to CD if not otherwise + set. DISKTYPE will be used more in the future for sizing too, but that + merge can wait a while longer yet. Closes: #361422 + * Use DISKTYPE and COMPLETE values to create the file .disk/cd_type for + the installer to use. -- Frans Pop Thu, 23 Nov 2006 01:42:00 +0100 diff --git a/tools/add_debs b/tools/add_debs index 6a29cc22..7146f77e 100755 --- a/tools/add_debs +++ b/tools/add_debs @@ -66,6 +66,16 @@ do echo 'local' >> $BDIR/CD$DISK/.disk/base_components fi + if [ $COMPLETE = 1 ]; then + if [ $DISKTYPE = DVD ]; then + echo "dvd" > .disk/cd_type + else + echo "full_cd" > .disk/cd_type + fi + else + echo "not_complete" > .disk/cd_type + fi + # Sort out the udeb include and exclude files if [ -n "$UDEB_INCLUDE" ] ; then if [ -r "$UDEB_INCLUDE" ] ; then diff --git a/tools/make_image b/tools/make_image index 266fd112..0c4b9d4f 100755 --- a/tools/make_image +++ b/tools/make_image @@ -42,13 +42,13 @@ do DISKINFO=`cat $DIR/$n.diskinfo` if [ $ARCH = "source" ] ; then - OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$n" + OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$DISKTYPE-$n" else - OUTFILE="${CDNAME:-debian}-$relname-$ARCH-binary-$n" + OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$DISKTYPE-binary-$n" fi # Clean up any old files - rm -f $OUT/$OUTFILE.raw $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template + rm -f $OUT/$OUTFILE.iso $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template date @@ -57,14 +57,14 @@ do case $DOJIGDO in 0) # No jigdo files, just straight ISO - echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts $dirs CD$n - $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts $dirs CD$n + echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.iso $opts $dirs CD$n + $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.iso $opts $dirs CD$n ;; 1) # jigdo files _and_ ISO echo $MKISOFS $MKISOFS_OPTS -V "$volid" \ - -o $OUT/$OUTFILE.raw \ + -o $OUT/$OUTFILE.iso \ -jigdo-jigdo $OUT/$OUTFILE.jigdo \ -jigdo-template $OUT/$OUTFILE.template \ -jigdo-map Debian=$MIRROR/ \ @@ -72,7 +72,7 @@ do -md5-list $DIR/md5-check \ $JIGDO_OPTS $opts $dirs CD$n $MKISOFS $MKISOFS_OPTS -V "$volid" \ - -o $OUT/$OUTFILE.raw \ + -o $OUT/$OUTFILE.iso \ -jigdo-jigdo $OUT/$OUTFILE.jigdo \ -jigdo-template $OUT/$OUTFILE.template \ -jigdo-map Debian=$MIRROR/ \