Re: Release: things to do ???
jason andrade <jason@dstc.edu.au> writes:
> On Wed, 9 Aug 2000, Ben Collins wrote:
>
> > Top level README's are generated at ISO build time. However, yes, we do
> > need to regenerate ISO's upon release. Mainly because we did not want to
> > take a chance of having bad ISO's out there that were labeled as "release"
>
> will the "release" isos be generated at least 24 hours before 2.2 is
> publicly announced ? the reason i ask is that it will take me a
> finite amount of time to actually rsync my TC3 images against Phil's
> "official" release builds on cdimage.. if there isn't any advance
> time to mirror/rsync then i tend to get local debianites complaining
> about my ineffficiency in having ISOs available..
I'm planning on building new images on Sunday Evening (UK time)
assuming everything's in place at that point.
Here are the differences between what's currently in CVS, and what I'm
planning to use for building the disks. I'll include the CONF.sh bit,
just for completeness. If someone wants to explain how I'd go about
checking the rest of this into CVS, go ahead, or alternatively could
someone do it for me please.
The main points are:
* make the version "2.2 r0" as per recent discussions here.
* make BINVOLID use "Bin-$$num" to keep it under 32 chars long,
and use ppc in place of powerpc for the same reason
* make pi-makelist for source CDs
* add-bin-doc: use version up to first space to generate the
dedication filename
* boot-powerpc.calc: tune the size of CD#1
Index: CONF.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/CONF.sh,v
retrieving revision 1.10
diff -u -r1.10 CONF.sh
--- CONF.sh 2000/07/02 11:09:34 1.10
+++ CONF.sh 2000/08/11 10:14:11
@@ -10,13 +10,13 @@
export CODENAME=potato
# Version number
-export DEBVERSION="2.2"
+export DEBVERSION="2.2 r0"
# Official or non-official set.
# NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
# ON THE OFFICIAL DEBIAN CD WEBSITE http://cdimage.debian.org
-export OFFICIAL="Unofficial"
-#export OFFICIAL="Official"
+#export OFFICIAL="test-cycle-3"
+export OFFICIAL="Official"
#export OFFICIAL="Official Beta"
# ... for arch
@@ -28,25 +28,27 @@
# images, however. Also, if you are using an NFS partition for
# some part of this, you must use this option.
# Paths to the mirrors
-export MIRROR=/ftp/debian
+export MIRROR=/home/ftp/debian
# Comment the following line if you don't have/want non-US
-#export NONUS=/ftp/debian-non-US
+export NONUS=/home/ftp/debian/non-US
# And this option will make you 2 copies of CD1 - one with all the
# non-US packages on it, one with none. Useful if you're likely to
# need both.
-#export FORCENONUSONCD1=1
+export FORCENONUSONCD1=1
# Path of the temporary directory
-export TDIR=/ftp/tmp
+export TDIR=/home/tmp
# Path where the images will be written
-export OUT=/rack/debian-cd
+#export OUT=/debian2/potato_nonUS_test
+#export OUT=/debian2/potato_USexportable_test
+export OUT=/debian2/test-area
# Where we keep the temporary apt stuff.
# This cannot reside on an NFS mount.
-export APTTMP=/ftp/tmp/apt
+export APTTMP=$TDIR/apt
# Do I want to have NONFREE merged in the CD set
# export NONFREE=1
@@ -78,5 +80,5 @@
# Options
# export MKISOFS=/usr/bin/mkhybrid
-# export MKISOFS_OPTS="-a -r -T" #For normal users
-# export MKISOFS_OPTS="-a -r -F . -T" #For symlink farmers
+export MKISOFS_OPTS="-a -r -T" #For normal users
+# export MKISOFS_OPTS="-a -r -F -T" #For symlink farmers
Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-cd/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 2000/07/25 16:39:13 1.24
+++ Makefile 2000/08/11 10:14:12
@@ -35,7 +35,11 @@
SRCDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num"
endif
ifndef BINVOLID
-BINVOLID="Debian $(DEBVERSION) $(ARCH) Binary-$$num"
+ifeq ($(ARCH),powerpc)
+BINVOLID="Debian $(DEBVERSION) ppc Bin-$$num"
+else
+BINVOLID="Debian $(DEBVERSION) $(ARCH) Bin-$$num"
+endif
endif
ifndef SRCVOLID
SRCVOLID="Debian $(DEBVERSION) Source-$$num"
Index: build_all.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/build_all.sh,v
retrieving revision 1.7
diff -u -r1.7 build_all.sh
--- build_all.sh 2000/07/25 15:03:56 1.7
+++ build_all.sh 2000/08/11 10:14:12
@@ -46,6 +46,9 @@
make src-official_images
echo Generating MD5Sums of the images
make imagesums
+ echo Generating list files for images
+ make pi-makelist
+
else
export OUT=$TMP_OUT/$ARCH; mkdir -p $OUT
make bin-official_images
Index: debian/CONF.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/debian/CONF.sh,v
retrieving revision 1.7
diff -u -r1.7 CONF.sh
--- debian/CONF.sh 2000/07/02 11:09:34 1.7
+++ debian/CONF.sh 2000/08/11 10:14:12
@@ -4,8 +4,8 @@
# Building potato cd set ...
export CODENAME=potato
-# Version number, 2.2 or 2.2_r3 etc.
-export DEBVERSION="2.2"
+# Version number, "2.2 r0", "2.2 r1" etc.
+export DEBVERSION="2.2 r0"
# Official or non-official set.
# NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
Index: tools/add-bin-doc
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/add-bin-doc,v
retrieving revision 1.2
diff -u -r1.2 add-bin-doc
--- tools/add-bin-doc 2000/07/25 15:03:56 1.2
+++ tools/add-bin-doc 2000/08/11 10:14:12
@@ -7,15 +7,17 @@
ADIR=$APTTMP/$CODENAME-$ARCH
SDIR=$TDIR/$CODENAME-src
+DEBMAINVER="`echo $DEBVERSION | sed -e 's/ .*//'`"
+
for i in $BDIR/*.packages; do
dir=${i%%.packages}
dir=${dir##$BDIR/}
dir=$BDIR/CD$dir
cp -df $MIRROR/README* $dir/
- if [ -f $dir/doc/dedication-$DEBVERSION.txt ]; then
- mv $dir/doc/dedication-$DEBVERSION.txt $dir/dedication.txt
- ln -s ../dedication.txt $dir/doc/dedication-$DEBVERSION.txt
+ if [ -f $dir/doc/dedication-$DEBMAINVER.txt ]; then
+ mv $dir/doc/dedication-$DEBMAINVER.txt $dir/dedication.txt
+ ln -s ../dedication.txt $dir/doc/dedication-$DEBMAINVER.txt
fi
rm -f $dir/README $dir/README.1ST \
Index: tools/boot/potato/boot-powerpc.calc
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/boot/potato/boot-powerpc.calc,v
retrieving revision 1.2
diff -u -r1.2 boot-powerpc.calc
--- tools/boot/potato/boot-powerpc.calc 2000/07/25 15:03:57 1.2
+++ tools/boot/potato/boot-powerpc.calc 2000/08/11 10:14:12
@@ -1,4 +1,4 @@
-BOOT_SIZE_1=120
+BOOT_SIZE_1=50
BOOT_SIZE_2=20
Reply to: