Updated debian-installer related tasks.

Changed powerpc kernel selection method in generate_di+k_list.

Updated boot-$ARCH for the arches using d-i so that it is easier to
change  the repository for d-i and removed -q option of wget to see
wget failures in the logs.

tasks/debian-installer+kernel

@@ -5,7 +5,7 @@
  * This list can be generated with the command:
  * ../tools/generate_di+k_list
  *
- * Last update: Sun Oct  5 08:09:06 MDT 2003
+ * Last update: Thu Nov 13 09:57:03 MST 2003
  */
 
 #include <debian-installer>
@@ -19,14 +19,11 @@ aptitude
 kernel-image-2.4.22-1-386
 #endif
 #ifdef ARCH_alpha
-kernel-image-2.2.25-generic
-kernel-image-2.2.25-jensen
-kernel-image-2.2.25-nautilus
-kernel-image-2.2.25-smp
 kernel-image-2.4-generic
 kernel-image-2.4-smp
 kernel-image-2.4.22-1-generic
 kernel-image-2.4.22-1-smp
+kernel-image-2.6.0-test9-1-generic
 #endif
 #ifdef ARCH_ia64
 kernel-image-2.4.20-itanium
@@ -35,12 +32,7 @@ kernel-image-2.4.20-mckinley
 kernel-image-2.4.20-mckinley-smp
 #endif
 #ifdef ARCH_powerpc
-kernel-image-2.4.19-powerpc
+kernel-image-2.4.22-powerpc
-kernel-image-2.4.19-powerpc-smp
+kernel-image-2.4.22-powerpc-smp
-kernel-image-2.4.20-apus
-kernel-image-2.4.20-powerpc
-kernel-image-2.4.20-powerpc-smp
-kernel-image-2.4.21-powerpc
-kernel-image-2.4.21-powerpc-smp
 #endif
 

tools/boot/sarge/boot-alpha

@@ -25,6 +25,9 @@ set -e
 N=$1
 CDDIR=$2
 BOOTDIR=
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~vorlon/d-i/images/daily"
+fi
 
 cd $CDDIR/..
 
@@ -46,7 +49,7 @@ NN=`echo $N | sed -e 's/_NONUS//'`
 for image in bootlx cdrom-initrd.gz cdrom-linux; do
     if [ ! -e "$image" ]; then
 	# XXX: not really 'daily'...
-	wget -q http://people.debian.org/~vorlon/d-i/images/daily/$image
+	wget $WWW_HOME/$image
     fi
 done
 

tools/boot/sarge/boot-i386

@@ -13,6 +13,9 @@ set -e
 N=$1
 CDDIR=$2
 BOOTDIR=
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~sjogren/d-i/images/daily"
+fi
 
 cd $CDDIR/..
 
@@ -45,7 +48,7 @@ THISTYPE=${KTYPE[$NN]}
 # XXX add net-image.img back when it's fixed
 for image in cd_drivers-image.img cdrom-image.img cdrom-initrd.gz floppy-image.img floppy-initrd.gz net_drivers-image.img netboot-initrd.gz vmlinuz ; do
     if [ ! -e "$image" ]; then
-	wget -q http://people.debian.org/~sjogren/d-i/images/daily/$image
+	wget $WWW_HOME/$image
     fi
 done
 

tools/boot/sarge/boot-ia64

@@ -13,6 +13,9 @@ set -x
 N=$1
 CDDIR=$2
 BOOTDIR=
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~jbailey/ia64"
+fi
 
 cd $CDDIR/..
 
@@ -25,7 +28,7 @@ fi
 # Download boot images
 for image in cdrom-image.img; do
     if [ ! -e "$image" ]; then
-	wget -q http://people.debian.org/~jbailey/ia64/$image
+	wget $WWW_HOME/$image
     fi
 done
 

tools/boot/sarge/boot-powerpc

@@ -13,7 +13,9 @@ set -e
 N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
-WWW_HOME="http://people.debian.org/~tsauter/"
+if [ ! "$WWW_HOME" ];then
+   WWW_HOME="http://people.debian.org/~tsauter/d-i/images-powerpc/daily"
+fi
 
 cd $CDDIR/..
 
@@ -59,8 +61,8 @@ cat $BASEDIR/data/sarge/yaboot/boot.msg \
 cat $BASEDIR/data/sarge/yaboot/yaboot.conf \
  | sed "s/CODENAME/${CODENAME}/g" > yaboot.conf
 cp $BASEDIR/data/yaboot/ofboot.b ofboot.b
-wget -O vmlinux $WWW_HOME/d-i/images-powerpc/daily/vmlinux
+wget -O vmlinux $WWW_HOME/vmlinux
-wget -O root.bin $WWW_HOME/d-i/images-powerpc/daily/cdrom-initrd.gz
+wget -O root.bin $WWW_HOME/cdrom-initrd.gz
 
 #
 # generate/download images for "apus"

tools/generate_di+k_list

@@ -54,8 +54,8 @@ cat >> debian-installer+kernel << EOF
 EOF
 
 #This is just temporary, they are going to change it all for 2.4.22
-/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
+/bin/sed -n 's/Package: \(kernel-image-.*-powerpc.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
+  $MIRROR/dists/$CODENAME/main/binary-powerpc/Packages |tail -n 2 \
   >> debian-installer+kernel
 
 cat >> debian-installer+kernel << EOF