From 40c7cb2411f8ef7e448a1c2fed43fedb8185ec25 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Thu, 11 Jul 2002 22:01:44 +0000 Subject: [PATCH] Patch courtesy of Petter Reinholdtsen, hand-applied because of conflicts. - Preserve timestamps when copying files into the CDs - Make sure build.sh can run in -e (stop on error) mode - Report if packages needed by debootstrap is missing on a CD - Report how much space is reserved on each CD - Handle boot-floppy directories without documentation --- CONF.sh | 52 ++++++++++++++++++------------------- Makefile | 2 ++ build.sh | 7 +++-- debian/changelog | 4 +++ tools/add-bin-doc | 14 +++++----- tools/boot/woody/boot-i386 | 4 +-- tools/woody/installtools.sh | 7 +++-- 7 files changed, 51 insertions(+), 39 deletions(-) diff --git a/CONF.sh b/CONF.sh index cdf6d410..dd26ef1e 100644 --- a/CONF.sh +++ b/CONF.sh @@ -4,32 +4,32 @@ # Unset all optional variables first to start from a clean state unset NONUS -unset FORCENONUSONCD1 -unset NONFREE -unset EXTRANONFREE -unset LOCAL -unset LOCALDEBS -unset SECURED -unset SECURITY -unset BOOTDIR -unset SYMLINK -unset COPYLINK -unset MKISOFS -unset MKISOFS_OPTS -unset ISOLINUX -unset EXCLUDE -unset SRCEXCLUDE -unset NORECOMMENDS -unset NOSUGGESTS -unset DOJIGDO -unset JIGDOCMD -unset JIGDOTEMPLATEURL -unset DEFBINSIZE -unset DEFSRCSIZE -unset FASTSUMS -unset PUBLISH_URL -unset PUBLISH_NONUS_URL -unset PUBLISH_PATH +unset FORCENONUSONCD1 || true +unset NONFREE || true +unset EXTRANONFREE || true +unset LOCAL || true +unset LOCALDEBS || true +unset SECURED || true +unset SECURITY || true +unset BOOTDIR || true +unset SYMLINK || true +unset COPYLINK || true +unset MKISOFS || true +unset MKISOFS_OPTS || true +unset ISOLINUX || true +unset EXCLUDE || true +unset SRCEXCLUDE || true +unset NORECOMMENDS || true +unset NOSUGGESTS || true +unset DOJIGDO || true +unset JIGDOCMD || true +unset JIGDOTEMPLATEURL || true +unset DEFBINSIZE || true +unset DEFSRCSIZE || true +unset FASTSUMS || true +unset PUBLISH_URL || true +unset PUBLISH_NONUS_URL || true +unset PUBLISH_PATH || true # The debian-cd dir diff --git a/Makefile b/Makefile index 0f5eec41..9ad16e70 100755 --- a/Makefile +++ b/Makefile @@ -451,6 +451,8 @@ $(BDIR)/packages-stamp: if [ "$$ok" = "yes" ]; then \ echo "CD$$DISK contains all packages needed by debootstrap"; \ touch $(BDIR)/CD$$DISK/.disk/base_installable; \ + else; \ + echo "CD$$DISK missing some packages needed by debootstrap"; \ fi; \ else \ echo "Unable to find debootstrap program"; \ diff --git a/build.sh b/build.sh index dba9564b..40b250e5 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,12 @@ -#!/bin/sh +#!/bin/sh -e # Script to build one arch . CONF.sh -[ -n "$1" ] && export ARCH=$1 +if [ -n "$1" ] ; then + export ARCH=$1 +fi make distclean make ${CODENAME}_status @@ -30,6 +32,7 @@ for CD in 1 2 3 4 5 6 7 8; do [ "$size" = "" ] && size=0 [ $CD = "1" ] && size=$(($size + $disks)) FULL_SIZE=`echo "($DEFBINSIZE - $size) * 1024 * 1024" | bc` + echo "INFO: Reserving $size MB on the $CD cd. SIZELIMIT=$FULL_SIZE." SIZE_ARGS="$SIZE_ARGS SIZELIMIT${CD}=$FULL_SIZE" done FULL_SIZE=`echo "($DEFSRCSIZE - $size) * 1024 * 1024" | bc` diff --git a/debian/changelog b/debian/changelog index 1090de0f..027c07a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ debian-cd (2.2.15) unstable; urgency=low * Provide a customised isolinux image. We don't need to recommend syslinux now. * Apply patch from Petter Reinholdtsen to put security updates on the cd. + * Apply patch from Petter Reinholdtsen to preserve timestamps, making + build.sh being able to run with -e set, report reserved space and + the space debootstrap needs. Also, handle boot-floppy directories + without docs. -- Raphael Hertzog Sun, 5 May 2002 12:12:36 +0200 diff --git a/tools/add-bin-doc b/tools/add-bin-doc index 3a9f7371..40a5b2b3 100755 --- a/tools/add-bin-doc +++ b/tools/add-bin-doc @@ -13,7 +13,7 @@ for i in $BDIR/*.packages; do dir=${i%%.packages} dir=${dir##$BDIR/} dir=$BDIR/CD$dir - cp -df $MIRROR/README* $dir/ + cp -pdf $MIRROR/README* $dir/ if [ -f $dir/doc/dedication-$DEBMAINVER.txt ]; then mv $dir/doc/dedication-$DEBMAINVER.txt $dir/dedication.txt @@ -37,14 +37,14 @@ for i in $BDIR/*.packages; do rm -f $dir/README.diskdefines mkdir -p $dir/pics - cp $BASEDIR/data/pics/*.* $dir/pics/ + cp -p $BASEDIR/data/pics/*.* $dir/pics/ if [ -e $MIRROR/dists/$CODENAME/main/Release-Notes ]; then - cp -f $MIRROR/dists/$CODENAME/main/Release-Notes $dir/ + cp -pf $MIRROR/dists/$CODENAME/main/Release-Notes $dir/ fi if [ -e $MIRROR/dists/$CODENAME/Contents-$ARCH.gz ]; then - cp -f $MIRROR/dists/$CODENAME/Contents-$ARCH.gz $dir/dists/$CODENAME/ + cp -pf $MIRROR/dists/$CODENAME/Contents-$ARCH.gz $dir/dists/$CODENAME/ else echo "WARNING: there's no Contents-$ARCH.gz file for $CODENAME !" fi @@ -52,7 +52,7 @@ for i in $BDIR/*.packages; do if [ -n "$NONUS" ] then if [ -e $NONUS/dists/$CODENAME/non-US/Contents-$ARCH.gz ]; then - cp -f $NONUS/dists/$CODENAME/non-US/Contents-$ARCH.gz \ + cp -pf $NONUS/dists/$CODENAME/non-US/Contents-$ARCH.gz \ $dir/dists/$CODENAME/non-US/ else echo "WARNING: there's no Content-$ARCH.gz file for $CODENAME/non-US !" @@ -60,7 +60,7 @@ for i in $BDIR/*.packages; do fi if [ -e $BASEDIR/data/$CODENAME/README.$ARCH ]; then - cp -f $BASEDIR/data/$CODENAME/README.$ARCH $dir/ + cp -pf $BASEDIR/data/$CODENAME/README.$ARCH $dir/ fi if [ -e $BASEDIR/data/$CODENAME/README.1ST.$ARCH ]; then @@ -73,7 +73,7 @@ for i in $BDIR/*.packages; do fi if [ -e $BASEDIR/data/$CODENAME/README.multicd ]; then - cp -f $BASEDIR/data/$CODENAME/README.multicd $dir/ + cp -pf $BASEDIR/data/$CODENAME/README.multicd $dir/ fi done diff --git a/tools/boot/woody/boot-i386 b/tools/boot/woody/boot-i386 index d66e004f..09b30290 100755 --- a/tools/boot/woody/boot-i386 +++ b/tools/boot/woody/boot-i386 @@ -97,7 +97,7 @@ if [ "${ISOLINUX:-0}" != "0" ]; then # Include Smart Boot Manager image for people where isolinux doesn't # work gzip -dc $BASEDIR/data/$CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin - cp $BASEDIR/data/$CODENAME/README.sbm $CDDIR/install/ + cp -p $BASEDIR/data/$CODENAME/README.sbm $CDDIR/install/ # Isolinux config files cp -f $BASEDIR/data/$CODENAME/isolinux.txt $BASEDIR/data/$CODENAME/f*.txt boot$N/isolinux/ cat > boot$N/isolinux/isolinux.cfg <