Add support for hurd-i386. Closes: #619211

data/wheezy/hurd-i386_businesscard_udeb_include

@@ -0,0 +1,2 @@
+choose-mirror
+netcfg

data/wheezy/hurd-i386_netinst_udeb_include

@@ -0,0 +1 @@
+netcfg

data/wheezy/hurd-i386_udeb_include

@@ -0,0 +1 @@
+netcfg

debian/changelog

@@ -3,6 +3,8 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * In the boot prompt for powerpc, make install64 more prominent.
     Closes: #614583
+
+  [ Steve McIntyre ]
   * Merge update-cd changes back from the squeeze branch:
     + Remove the old non-US stuff from it, it's not been needed in years.
     + Cope with .bz2 source files too.
@@ -11,7 +13,10 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
   * Update make_disc_trees.pl and which_deb to cope with different
     types of source file, and clean up the code in that area.
   * tools/make_image: generate list files while we have the CD trees
-    availables
+    available
+
+  [ Aurelien Jarno ]
+  * Add support for hurd-i386. Closes: #619211
 
  -- Steve McIntyre <93sam@debian.org>  Sun, 06 Mar 2011 19:16:00 +0000
 

tools/boot/wheezy/boot-hurd

@@ -0,0 +1,94 @@
+# This script gets sourced from boot-hurd-i386.
+#
+# Do install stuff for hurd, including making bootable CDs
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
+
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/x86-desktop.sh
+
+set -e
+#set -x
+
+N=$1
+CDDIR=$2
+BOOTDIR=
+if [ "$DI_WWW_HOME" = "default" ];then
+    DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/"
+    if [ -n "$DI_DIR" ];then
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_WWW_HOME=""
+        echo "Using images from $DI_DIR"
+    fi
+fi
+if [ ! "$DI_DIST" ]; then
+       DI_DIST="$DI_CODENAME"
+fi
+
+cd $CDDIR/..
+
+# Only disc 1 bootable
+if [ $N != 1 ]; then
+       add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+       exit 0
+fi
+
+# Download boot images.
+BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/gnumach.gz cdrom/initrd.gz cdrom/ext2fs.static cdrom/ld.so.1"
+
+for image in $BOOT_IMAGES; do
+       if [ ! -e "$image" ]; then
+               dir=$(dirname $image)
+               mkdir -p $dir
+               if [ ! "$DI_WWW_HOME" ];then
+                       if [ ! "$DI_DIR" ];then
+                               DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+                       fi
+                       cp "$DI_DIR/$image" $image
+               else
+                       wget "$DI_WWW_HOME/$image" -O $image
+               fi
+       fi
+done
+
+# Install kernel and initrd
+mkdir -p $CDDIR/boot/kernel/
+cp "cdrom/gnumach.gz" "$CDDIR/boot/kernel/gnumach.gz"
+cp "cdrom/initrd.gz" "$CDDIR/boot/initrd.gz"
+cp "cdrom/ext2fs.static" "$CDDIR/boot/kernel/ext2fs.static"
+cp "cdrom/ld.so.1" "$CDDIR/boot/kernel/ld.so.1"
+
+# Install bootloader
+mkdir -p boot$N
+tar -C boot$N -zxf cdrom/debian-cd_info.tar.gz
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/grub/grub_eltorito"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.cat"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
+
+# Add autorun
+if [ -f $CDDIR/README.html ]; then
+       todos > $CDDIR/autorun.inf <<EOF
+[autorun]
+open=autorun.bat
+EOF
+       todos > $CDDIR/autorun.bat <<EOF
+@echo Starting "README.html"...
+@start README.html
+@exit
+EOF
+fi
+
+# Install languages
+install_languages $CDDIR
+
+# Cleanup
+rm -rf cdrom
+
+# done

tools/boot/wheezy/boot-hurd-i386

@@ -0,0 +1,2 @@
+#!/bin/bash
+. $BASEDIR/tools/boot/$DI_CODENAME/boot-hurd

tools/generate_di+k_list

@@ -302,4 +302,14 @@ grub-pc
 libc0.1-i686
 #endif
 
+#ifdef ARCH_hurd_i386
+gnumach-image-1-486
+grub-pc
+libc0.3-i686
+#ifdef VARIANT_xen
+gnumach-image-1-xen-486
+libc0.3-xen
+#endif
+#endif
+
 EOF

tools/grab_md5

@@ -49,7 +49,7 @@ do
                                         DIR = ""
                                 }' | sort | uniq >> $OUT
             ;;
-        alpha|amd64|arm|armel|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc|kfreebsd-amd64|kfreebsd-i386)
+        alpha|amd64|arm|armel|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc|kfreebsd-amd64|kfreebsd-i386|hurd-i386)
             FILES=`find $LOCATIONS -name Packages.gz | grep binary-$ARCH`
             echo "Using MD5 sums from Packages files:"
             echo $FILES

tools/start_new_disc

@@ -48,6 +48,8 @@ if [ $NUM_ARCHES = 1 ] ; then
                     export VOLID="$VOLID_BASE f-i386 $DISKNUM" ;;
                 kfreebsd-amd64)
                     export VOLID="$VOLID_BASE f-amd64 $DISKNUM" ;;
+                hurd-i386)
+                    export VOLID="$VOLID_BASE h-i386 $DISKNUM" ;;
                 *)
                     export VOLID="$VOLID_BASE $ARCHES $DISKNUM" ;;
             esac