potato(i386) CD images
Hi,
I made potato CD(only i386) images. Non-US files are included in the second
image(non-US non-free files are not included).
hattas@emperor:~ $ ls -l potato-cd
total 2730940
-rw-rw-r-- 1 hattas hattas 595572736 Jun 3 13:53 potato1-i386.raw
-rw-rw-r-- 1 hattas hattas 856844288 Jun 3 14:03 potato2-i386.raw
-rw-rw-r-- 1 hattas hattas 599064576 Jun 3 14:09 potato3.raw
-rw-rw-r-- 1 hattas hattas 734070784 Jun 3 14:17 potato4.raw
I have removed project/ from potato3.raw. If the directry is included,
size of the third image is:
-rw-rw-r-- 1 hattas hattas 750782464 Jun 3 12:19 potato3.raw
I made a patch for making images, that is attached below.
If you apply this patch and run debian_cd with non-US option, you need to
make three files. This is needed at only first time.
$ touch debian-cd/potato/cd1.non-US.list
$ touch debian-cd/potato/cd3.non-US.list
$ touch debian-cd/potato/cd4.non-US.list
(cd2.non-US.list is included in the patch)
runtime options I used:
export SCANPACKAGES=/usr/bin/dpkg-scanpackages
export TDIR=/home/hattas/i386-tmp
export OUT=/home/hattas/potato-cd
export NONUS=/home/ftp/debian-non-US
export MKISOFS_OPTS="-a -r -T"
./debian_cd -v -v -v clean genlist tree flatten packages boot images non-US force_deps
Thanks.
diff -u -N -r debian-cd.orig/boot-i386 debian-cd/boot-i386
--- debian-cd.orig/boot-i386 Thu Apr 1 15:58:04 1999
+++ debian-cd/boot-i386 Thu Jun 3 11:25:07 1999
@@ -13,6 +13,7 @@
# $4 is the binary arch
# $5 is debug level
# $6 is $BOOTDIR (not needed for i386, but let's stay consistent)
+# $7 is $CODENAME (slink, potato, ... etc)
MIRROR=$1
BASEDIR=$2
@@ -20,21 +21,22 @@
ARCH=$4
VERBOSE=$5
BOOTDIR=$6
+CODENAME=$7
. $BASEDIR/vecho # Include local definitions for vecho, vvecho, vvvecho
# Now check the boot-disks; make sure they exist and we
# have a "current" directory. If not, exit
-if [ ! -e slink1/dists/stable/main/disks-$ARCH ] ; then
+if [ ! -e ${CODENAME}1/dists/${CODENAME}/main/disks-$ARCH ] ; then
echo "No boot disks found for arch $ARCH."
echo "Exit."
exit 1
fi
-(cd slink1/dists/stable/main/disks-$ARCH/current/ ; \
- cp resc*.bin linux root.bin $TDIR/slink1/install )
+(cd ${CODENAME}1/dists/${CODENAME}/main/disks-$ARCH/current/ ; \
+ cp resc*.bin linux root.bin $TDIR/${CODENAME}1/install )
-cd slink1/dists/stable/main/disks-$ARCH
+cd ${CODENAME}1/dists/$CODENAME/main/disks-$ARCH
if [ ! -e current ] ; then
echo "No \"current\" boot disks found for arch $ARCH."
echo "Exit."
@@ -61,31 +63,31 @@
cd $TDIR
# Hack for bootable disks
vecho "Copying boot image to <root>/boot for disc 1"
-cp slink1/dists/stable/main/disks-$ARCH/current/resc1440.bin \
+cp ${CODENAME}1/dists/$CODENAME/main/disks-$ARCH/current/resc1440.bin \
boot1/boot
-if [ -e slink1/dists/stable/main/disks-$ARCH/current/resc1440tecra.bin ] ; then
+if [ -e ${CODENAME}1/dists/$CODENAME/main/disks-$ARCH/current/resc1440tecra.bin ] ; then
mkdir -p boot2/boot
vecho "Copying tecra boot image to <root>/boot for disc 2"
- cp slink1/dists/stable/main/disks-$ARCH/current/resc1440tecra.bin \
+ cp ${CODENAME}1/dists/$CODENAME/main/disks-$ARCH/current/resc1440tecra.bin \
boot2/boot
fi
vecho "Extracting tools for disc 1"
-mkdir -p slink1/tools/fips20
-(cd slink1/tools/fips20; \
+mkdir -p ${CODENAME}1/tools/fips20
+(cd ${CODENAME}1/tools/fips20; \
unzip -Lq $MIRROR/tools/fips20.zip; \
rm restorrb source -rf)
-(cd slink1/tools; \
+(cd ${CODENAME}1/tools; \
unzip -Lq $MIRROR/tools/lodlin16.zip; \
rm lodlin16/src lodlin16/initrd loadlin16/debian -rf )
-mkdir slink1/tools/rawrite1
-(cd slink1/tools/rawrite1; \
+mkdir ${CODENAME}1/tools/rawrite1
+(cd ${CODENAME}1/tools/rawrite1; \
unzip -Lq $MIRROR/tools/rawrite1.zip )
-mkdir slink1/tools/rawrite2
-(cd slink1/tools/rawrite2; \
+mkdir ${CODENAME}1/tools/rawrite2
+(cd ${CODENAME}1/tools/rawrite2; \
unzip -Lq $MIRROR/tools/rawrite2.zip; \
rm rawrite2.c )
@@ -95,16 +97,16 @@
echo "rawrite1/ rawrite 1.3 : create disks from disk images (*.bin)"; \
echo "rawrite2/ rawrite 2.0 : create disks from disk images (*.bin)"; \
echo " rawrite 2.0 is much faster, but it locks up on some machines";\
- ) |todos > slink1/tools/README.tools
+ ) |todos > ${CODENAME}1/tools/README.tools
-cp slink1/tools/lodlin16/*.exe slink1/install
-cp slink1/tools/rawrite1/rawrite3.com slink1/install/rw1_3.com
-cp slink1/tools/rawrite2/rawrite2.exe slink1/install/rw2_0.exe
-cp slink1/tools/fips*/*.exe slink1/install
+cp ${CODENAME}1/tools/lodlin16/*.exe ${CODENAME}1/install
+cp ${CODENAME}1/tools/rawrite1/rawrite3.com ${CODENAME}1/install/rw1_3.com
+cp ${CODENAME}1/tools/rawrite2/rawrite2.exe ${CODENAME}1/install/rw2_0.exe
+cp ${CODENAME}1/tools/fips*/*.exe ${CODENAME}1/install
(echo "@ echo off" ; \
echo "rem Flush any write-cached disk blocks before we leave DOS. " ; \
echo "smartdrv /c" ; \
echo "loadlin.exe linux root=/dev/ram ro initrd=root.bin" ; \
- ) |todos > slink1/install/boot.bat
+ ) |todos > ${CODENAME}1/install/boot.bat
diff -u -N -r debian-cd.orig/debian_cd debian-cd/debian_cd
--- debian-cd.orig/debian_cd Mon May 31 06:34:20 1999
+++ debian-cd/debian_cd Thu Jun 3 11:36:22 1999
@@ -465,6 +465,9 @@
cat $CODENAME/cd$i.$TYPE | sed "s/ARCH/$ARCH/g" >$TDIR/cd$i.$TYPE
fi
done
+ if [ "$NU"x == "1"x ] ; then
+ cat $CODENAME/cd$i.non-US.list | sed "s/ARCH/$ARCH/g" > $TDIR/cd$i.non-US.list
+ fi
done
vecho " mkisofsrc"
cat mkisofsrc | sed "s/ARCH/$ARCH/g" >$TDIR/.mkisofs
@@ -599,6 +602,11 @@
cd $TDIR/$CODENAME$i
ln -s . debian
+ # debian-non-US
+ if [ "$NU"x == "1"x ]; then
+ ln -s . debian-non-US
+ fi
+
# Set up symlinks so things may work.
cd dists
ln -s $CODENAME $CODENAME_STATUS
@@ -630,6 +638,15 @@
vecho "cp -dpRPl $file $TDIR/$CODENAME$i"
cp -dpRPl $file $TDIR/$CODENAME$i
done
+ if [ "$NU"x == "1"x ]; then
+ cd $NONUS
+ vecho " Create tree"
+ for file in `cat $TDIR/cd$i.non-US.list`
+ do
+ vecho "cp -dpRPl $file $TDIR/$CODENAME$i"
+ cp -dpRPl $file $TDIR/$CODENAME$i
+ done
+ fi
done
cd $TDIR
@@ -680,9 +697,9 @@
if [ "$ARCH"x = "i386"x ] ; then
vecho "Disk 1"
vecho " upgrade-2.0-i386"
- (cd $TDIR/$(CODENAME)1 && ln -s dists/$CODENAME_STATUS/main/upgrade-2.0-i386)
+ (cd $TDIR/${CODENAME}1 && ln -s dists/$CODENAME_STATUS/main/upgrade-2.0-i386)
vecho " upgrade-older-i386"
- (cd $TDIR/$(CODENAME)1 && ln -s dists/$CODENAME_STATUS/main/upgrade-older-i386)
+ (cd $TDIR/${CODENAME}1 && ln -s dists/$CODENAME_STATUS/main/upgrade-older-i386)
fi
fi
fi
@@ -690,7 +707,7 @@
# Fix the crypt++el_2.84-2.deb brokenness in non-US - temporary workaround...
if [ "$NU"x = "1"x ] ; then
vecho "Looking for broken crypt++el_2.84-2.deb link in non-US..."
- cd $TDIR/$(CODENAME)2/dists/$CODENAME/non-US/binary-$ARCH
+ cd $TDIR/${CODENAME}2/dists/$CODENAME/non-US/binary-$ARCH
if [ -L crypt++el_2.84-2.deb ] ; then
link=`ls -l crypt++el_2.84-2.deb | awk '{print $11}'`
if [ "$link"x != "../binary-all/crypt++el_2.84-2.deb"x ] ; then
@@ -942,6 +959,8 @@
OVER_NU=$NONUS/indices/override.$CODENAME.nonus
elif [ -e $NONUS/indices/override.$CODENAME.nonus.gz ] ; then
OVER_NU=$NONUS/indices/override.$CODENAME.nonus.gz
+ elif [ -e $NONUS/indices-non-US/override.$CODENAME.gz ] ; then
+ OVER_NU=$NONUS/indices-non-US/override.$CODENAME.gz
elif [ -e $MIRROR/indices/override.non-us.$CODENAME ] ; then
OVER_NU=$MIRROR/indices/override.non-us.$CODENAME
elif [ -e $MIRROR/indices/override.non-us.$CODENAME.gz ] ; then
@@ -954,10 +973,10 @@
echo "Exit."
exit 1
fi
- (cd $TDIR/$CODENAME$i/dists/$CODENAME_STATUS/non-US && \
+ (cd $TDIR/$CODENAME$i/dists/$CODENAME_STATUS/non-US/main && \
$SCANPACKAGES -m "`cat $TDIR/$CODENAME$i/.disk/info`" \
binary-$ARCH $OVER_NU \
- dists/$CODENAME_STATUS/non-US/ > $TDIR/Packages-non-US.$i)
+ dists/$CODENAME_STATUS/non-US/main > $TDIR/Packages-non-US.$i)
fi
if [ "$NF"x = "1"x ] ; then
@@ -1068,11 +1087,11 @@
vecho "Making bootable images for $ARCH..."
cd $TDIR
- mkdir -m 755 $(CODENAME)1/install
- (cd $(CODENAME)1/dists/$CODENAME_STATUS/main/disks-$ARCH/current/ ; \
- cp *.txt *.html $TDIR/$(CODENAME)1/install )
+ mkdir -m 755 ${CODENAME}1/install
+ (cd ${CODENAME}1/dists/$CODENAME_STATUS/main/disks-$ARCH/current/ ; \
+ cp *.txt *.html $TDIR/${CODENAME}1/install )
- (cd $(CODENAME)1/doc;
+ (cd ${CODENAME}1/doc;
for file in ../install/*.{html,txt}; do ln -s $file; done)
# Hack for bootable disks
@@ -1083,7 +1102,7 @@
"i386"x|"sparc"x|"m68k"x|"alpha"x|"powerpc"x)
vecho "ARCH is $ARCH, we know what to do. Continuing..."
- $BASEDIR/boot-$ARCH $MIRROR $BASEDIR $TDIR $ARCH $VERBOSE $BOOTDIR
+ $BASEDIR/boot-$ARCH $MIRROR $BASEDIR $TDIR $ARCH $VERBOSE $BOOTDIR $CODENAME
if [ $? -gt 0 ] ; then
echo "boot-$ARCH failed. Exit."
exit 1
@@ -1115,10 +1134,10 @@
if [ -d boot1 ]; then
MKISOFS_OPTS_DISC1="boot1"
# move install tree to correct location
- if [ -d $TDIR/$(CODENAME)1/install ] ; then
+ if [ -d $TDIR/${CODENAME}1/install ] ; then
vecho "Moving install to boot1"
rm -rf $TDIR/boot1/install || true
- mv $TDIR/$(CODENAME)1/install $TDIR/boot1
+ mv $TDIR/${CODENAME}1/install $TDIR/boot1
fi
fi
;;
@@ -1195,52 +1214,52 @@
if [ "$IMAGE1"x = "1"x ] ; then
echo IMAGE1:
VOLID1=`cat $TDIR/cd1.volid`
- vecho "Making image of cd1 to $OUT/$(CODENAME)1-$ARCH.raw"
+ vecho "Making image of cd1 to $OUT/${CODENAME}1-$ARCH.raw"
vecho $MKISOFS $MKISOFS_OPTS -V "$VOLID1" \
- -o $OUT/$(CODENAME)1-$ARCH.raw $MKISOFS_OPTS_DISC1 $(CODENAME)1
+ -o $OUT/${CODENAME}1-$ARCH.raw $MKISOFS_OPTS_DISC1 ${CODENAME}1
$MKISOFS $MKISOFS_OPTS -V "$VOLID1" \
- -o $OUT/$(CODENAME)1-$ARCH.raw $MKISOFS_OPTS_DISC1 $(CODENAME)1
+ -o $OUT/${CODENAME}1-$ARCH.raw $MKISOFS_OPTS_DISC1 ${CODENAME}1
fi
if [ "$IMAGE2"x = "1"x ] ; then
echo IMAGE2:
VOLID2=`cat $TDIR/cd2.volid`
- vecho "Making image of cd2 to $OUT/$(CODENAME)2-$ARCH.raw"
+ vecho "Making image of cd2 to $OUT/${CODENAME}2-$ARCH.raw"
vecho $MKISOFS $MKISOFS_OPTS -V "$VOLID2" \
- -o $OUT/$(CODENAME)2-$ARCH.raw $MKISOFS_OPTS_DISC2 $(CODENAME)2
+ -o $OUT/${CODENAME}2-$ARCH.raw $MKISOFS_OPTS_DISC2 ${CODENAME}2
$MKISOFS $MKISOFS_OPTS -V "$VOLID2" \
- -o $OUT/$(CODENAME)2-$ARCH.raw $MKISOFS_OPTS_DISC2 $(CODENAME)2
+ -o $OUT/${CODENAME}2-$ARCH.raw $MKISOFS_OPTS_DISC2 ${CODENAME}2
fi
if [ "$IMAGE3"x = "1"x ] ; then
echo IMAGE3:
VOLID3=`cat $TDIR/cd3.volid`
- vecho "Making image of cd3 to $OUT/$(CODENAME)3.raw"
+ vecho "Making image of cd3 to $OUT/${CODENAME}3.raw"
vecho $MKISOFS $MKISOFS_OPTS -V "$VOLID3" \
- -o $OUT/$(CODENAME)3.raw $MKISOFS_OPTS_DISC3 $(CODENAME)3
+ -o $OUT/${CODENAME}3.raw $MKISOFS_OPTS_DISC3 ${CODENAME}3
$MKISOFS $MKISOFS_OPTS -V "$VOLID3" \
- -o $OUT/$(CODENAME)3.raw $MKISOFS_OPTS_DISC3 $(CODENAME)3
+ -o $OUT/${CODENAME}3.raw $MKISOFS_OPTS_DISC3 ${CODENAME}3
fi
if [ "$IMAGE4"x = "1"x ] ; then
echo IMAGE4:
VOLID4=`cat $TDIR/cd4.volid`
- vecho "Making image of cd4 to $OUT/$(CODENAME)4.raw"
+ vecho "Making image of cd4 to $OUT/${CODENAME}4.raw"
vecho $MKISOFS $MKISOFS_OPTS -V "$VOLID4" \
- -o $OUT/$(CODENAME)4.raw $MKISOFS_OPTS_DISC4 $(CODENAME)4
+ -o $OUT/${CODENAME}4.raw $MKISOFS_OPTS_DISC4 ${CODENAME}4
$MKISOFS $MKISOFS_OPTS -V "$VOLID4" \
- -o $OUT/$(CODENAME)4.raw $MKISOFS_OPTS_DISC4 $(CODENAME)4
+ -o $OUT/${CODENAME}4.raw $MKISOFS_OPTS_DISC4 ${CODENAME}4
fi
if [ "$IMAGE5"x = "1"x ] ; then
echo IMAGE5:
VOLID5=`cat $TDIR/cd5.volid`
- vecho "Making image of cd5 to $OUT/$(CODENAME)5-$ARCH.raw"
+ vecho "Making image of cd5 to $OUT/${CODENAME}5-$ARCH.raw"
if [ "$NF"x = "1"x ] ; then
vecho $MKISOFS $MKISOFS_OPTS -V "$VOLID5" \
- -o $OUT/$(CODENAME)5-$ARCH.raw $MKISOFS_OPTS_DISC5 $(CODENAME)5
+ -o $OUT/${CODENAME}5-$ARCH.raw $MKISOFS_OPTS_DISC5 ${CODENAME}5
$MKISOFS $MKISOFS_OPTS -V "$VOLID5" \
- -o $OUT/$(CODENAME)5-$ARCH.raw $MKISOFS_OPTS_DISC5 $(CODENAME)5
+ -o $OUT/${CODENAME}5-$ARCH.raw $MKISOFS_OPTS_DISC5 ${CODENAME}5
fi
fi
fi
@@ -1250,20 +1269,20 @@
if [ "$IMAGE1"x = "1"x ] ; then
if [ "$ARCH"x = "alpha"x ] ; then
vecho "Making $CODNAME1 image bootable"
- isomarkboot $OUT/$(CODENAME)1-$ARCH.raw /boot/bootlx /dists/$CODENAME/main/disks-al/1999-03-/root1440.bin
+ isomarkboot $OUT/${CODENAME}1-$ARCH.raw /boot/bootlx /dists/$CODENAME/main/disks-al/1999-03-/root1440.bin
fi
if [ "$ARCH"x = "sparc"x ] ; then
# temporary mount point (eg. for silo to create the
# bootable CD image) only needed for Sparc so far...
vecho Checking for temporary mount point for SILO
- mountpoint=/var/tmp/$(CODENAME)_cd.mnt
+ mountpoint=/var/tmp/${CODENAME}_cd.mnt
if [ -d $mountpoint ]; then
umount $mountpoint || true
else
mkdir -p $mountpoint
fi
- vecho "Making $(CODENAME)1 image bootable"
+ vecho "Making ${CODENAME}1 image bootable"
EXECARCH=`dpkg --print-installation-architecture`
if [ "$EXECARCH"x = "sparc"x ]; then
siloprog=silo
@@ -1276,11 +1295,11 @@
cd3=/install/linux-2.2.1-a.out
cd4=/install/linux-2.2.1-sun4u-a.out
cd5=/install/root.bin
- echo "mount -o loop $OUT/$(CODENAME)1-$ARCH.raw $mountpoint"
- mount -o loop $OUT/$(CODENAME)1-$ARCH.raw $mountpoint
- vecho $siloprog -r $mountpoint -c $OUT/$(CODENAME)1-$ARCH.raw \
+ echo "mount -o loop $OUT/${CODENAME}1-$ARCH.raw $mountpoint"
+ mount -o loop $OUT/${CODENAME}1-$ARCH.raw $mountpoint
+ vecho $siloprog -r $mountpoint -c $OUT/${CODENAME}1-$ARCH.raw \
-C /boot/silo.conf -l $cd1,$cd2,$cd3,$cd4,$cd5
- $siloprog -r $mountpoint -c $OUT/$(CODENAME)1-$ARCH.raw \
+ $siloprog -r $mountpoint -c $OUT/${CODENAME}1-$ARCH.raw \
-C /boot/silo.conf -l $cd1,$cd2,$cd3,$cd4,$cd5
umount $mountpoint
else
diff -u -N -r debian-cd.orig/potato/cd1.list debian-cd/potato/cd1.list
--- debian-cd.orig/potato/cd1.list Fri May 28 08:42:36 1999
+++ debian-cd/potato/cd1.list Thu Jun 3 11:00:02 1999
@@ -1,4 +1,5 @@
dists/potato/main/disks-ARCH
+dists/slink/main/disks-ARCH
dists/potato/main/upgrade-*ARCH*/
doc
README.*
diff -u -N -r debian-cd.orig/potato/cd2.list debian-cd/potato/cd2.list
--- debian-cd.orig/potato/cd2.list Fri May 28 08:42:36 1999
+++ debian-cd/potato/cd2.list Sat May 29 01:49:11 1999
@@ -1,8 +1,5 @@
dists/potato/contrib/binary-ARCH
dists/potato/contrib/binary-all
dists/potato/contrib/source
-dists/potato/non-US/binary-ARCH
-dists/potato/non-US/binary-all
-dists/potato/non-US/source
doc
README.*
diff -u -N -r debian-cd.orig/potato/cd2.non-US.list debian-cd/potato/cd2.non-US.list
--- debian-cd.orig/potato/cd2.non-US.list Thu Jan 1 09:00:00 1970
+++ debian-cd/potato/cd2.non-US.list Sat May 29 01:49:33 1999
@@ -0,0 +1,6 @@
+dists/potato/non-US/main/binary-ARCH
+dists/potato/non-US/main/binary-all
+dists/potato/non-US/main/source
+dists/potato/non-US/contrib/binary-ARCH
+dists/potato/non-US/contrib/binary-all
+dists/potato/non-US/contrib/source
diff -u -N -r debian-cd.orig/potato/cd3.list debian-cd/potato/cd3.list
--- debian-cd.orig/potato/cd3.list Fri May 28 08:42:36 1999
+++ debian-cd/potato/cd3.list Thu Jun 3 13:04:40 1999
@@ -1,4 +1,3 @@
-project
doc
README.*
dists/potato/main/source/admin
Reply to: