On Sun, Oct 24, 2004 at 11:45:16PM +0100, Steve McIntyre wrote: > > > >I did however patch debian-cd, but I never really got it working > >properly. Maybe I just don't know how to use it. > > > >I'll try to dig up the changes I've made to it tomorrow and send > >them to you. > > Cool, thanks. I'll try and merge the changes into debian-cd too.
I've attached a cvs diff of the changes I've made and I've also attached the new files. Kurt
? data/sarge/amd64_businesscard_udeb_include ? data/sarge/amd64_netinst_udeb_include ? data/sarge/amd64_udeb_include ? data/sarge/exclude-udebs-amd64 ? tools/boot/sarge/boot-amd64 Index: build_all.sh =================================================================== RCS file: /cvs/debian-boot/debian-cd/build_all.sh,v retrieving revision 1.14 diff -u -r1.14 build_all.sh --- build_all.sh 9 Jul 2004 14:50:34 -0000 1.14 +++ build_all.sh 25 Oct 2004 19:26:52 -0000 @@ -6,7 +6,7 @@ TMP_OUT=$OUT -for ARCH in i386 alpha arm hppa ia64 m68k mips mipsel powerpc s390 sparc +for ARCH in i386 amd64 alpha arm hppa ia64 m68k mips mipsel powerpc s390 sparc do export ARCH echo "Now we're going to build CD for $ARCH !" Index: update-cd =================================================================== RCS file: /cvs/debian-boot/debian-cd/update-cd,v retrieving revision 1.10 diff -u -r1.10 update-cd --- update-cd 12 Jul 2004 21:20:43 -0000 1.10 +++ update-cd 25 Oct 2004 19:26:52 -0000 @@ -48,7 +48,7 @@ VERBOSE=2 export VERBOSE BASEDIR SECTS -ARCHLIST="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc src" # all dealt with specially +ARCHLIST="alpha arm hppa i386 amd64 ia64 m68k mips mipsel powerpc s390 sparc src" # all dealt with specially export TDIR NONFREE NONUS VER MIRROR CODENAME OUT BASEDIR Index: data/sarge/README.html.in =================================================================== RCS file: /cvs/debian-boot/debian-cd/data/sarge/README.html.in,v retrieving revision 1.5 diff -u -r1.5 README.html.in --- data/sarge/README.html.in 5 May 2004 15:30:37 -0000 1.5 +++ data/sarge/README.html.in 25 Oct 2004 19:26:52 -0000 @@ -18,6 +18,7 @@ #endif #undef i386 +#undef amd64 #undef alpha #undef powerpc #undef ppc @@ -355,7 +356,7 @@ <A href=%%""install/floppy/%%"">/install/floppy/</a> </tt> -#if ARCHi386 || ARCHalpha || ARCHpowerpc || ARCHsparc +#if ARCHi386 || ARCHamd64 || ARCHalpha || ARCHpowerpc || ARCHsparc <P> For the impatient ones: #endif @@ -366,7 +367,7 @@ <P> #endif -#if ARCHi386 || ARCHpowerpc +#if ARCHi386 || ARCHamd64 || ARCHpowerpc #if ARCHi386 You can also #else Index: tasks/base-sarge =================================================================== RCS file: /cvs/debian-boot/debian-cd/tasks/base-sarge,v retrieving revision 1.6 diff -u -r1.6 base-sarge --- tasks/base-sarge 1 Oct 2004 15:11:14 -0000 1.6 +++ tasks/base-sarge 25 Oct 2004 19:26:52 -0000 @@ -7,7 +7,7 @@ * * The script used to generate this file is : -for arch in alpha arm i386 ia64 m68k powerpc sparc mips mipsel hppa s390 +for arch in alpha arm i386 amd64 ia64 m68k powerpc sparc mips mipsel hppa s390 do echo "#ifdef ARCH_$arch" debootstrap --arch $arch --print-debs $CODENAME | tr ' ' '\n' | grep -v "^$" @@ -411,6 +411,133 @@ psmisc pcmcia-cs ipchains +iptables + +#ifdef ARCH_amd64 +base-files +base-passwd +bash +bsdutils +coreutils +libacl1 +libattr1 +debconf +debconf-i18n +liblocale-gettext-perl +libtext-wrapi18n-perl +libtext-charwidth-perl +debianutils +diff +dpkg +dselect +libblkid1 +e2fsprogs +e2fslibs +libcomerr2 +libss2 +libuuid1 +findutils +grep +gzip +hostname +libcap1 +libc6 +libdb1-compat +libdb3 +libncurses5 +libnewt0.51 +libpam-modules +libpam-runtime +libpam0g +libperl5.8 +libpopt0 +login +makedev +mawk +modutils +mount +ncurses-base +ncurses-bin +passwd +perl-base +procps +sed +slang1a-utf8 +initscripts +sysvinit +sysv-rc +tar +util-linux +whiptail +libgcc1 +gcc-3.3-base +libstdc++5 +libtext-iconv-perl +zlib1g +adduser +apt +apt-utils +libdb4.2 +at +base-config +aptitude +libsigc++-1.2-5c102 +bsdmainutils +console-common +console-tools +libconsole +console-data +cpio +cron +dhcp-client +ed +exim4 +exim4-base +exim4-config +exim4-daemon-light +libgnutls10 +libgcrypt7 +libgpg-error0 +libopencdk8 +libtasn1-2 +fdutils +gettext-base +groff-base +ifupdown +info +klogd +libssl0.9.7 +liblzo1 +zlib1g +liblockfile1 +libpcre3 +libwrap0 +logrotate +mailx +man-db +libgdbm3 +manpages +nano +net-tools +netbase +netkit-inetd +iputils-ping +nvi +ppp +pppconfig +pppoe +pppoeconf +libpcap0.7 +sysklogd +tasksel +libtextwrap1 +tcpd +telnet +libtext-iconv-perl +wget +pciutils +setserial +psmisc iptables #endif Index: tasks/debian-installer =================================================================== RCS file: /cvs/debian-boot/debian-cd/tasks/debian-installer,v retrieving revision 1.22 diff -u -r1.22 debian-installer --- tasks/debian-installer 6 Oct 2004 20:38:24 -0000 1.22 +++ tasks/debian-installer 25 Oct 2004 19:26:52 -0000 @@ -556,6 +556,137 @@ xfsprogs-udeb zlib1g-udeb #endif /* ARCH_i386 */ +#ifdef ARCH_amd64 +autopartkit +base-installer +baseconfig-udeb +brltty-udeb +bterm-unifont +bugreporter-udeb +cdebconf-text-udeb +cdebootstrap-udeb +choose-mirror +console-keymaps-acorn +console-keymaps-amiga +console-keymaps-at +console-keymaps-atari +console-keymaps-dec +console-keymaps-mac +console-keymaps-sun +console-keymaps-usb +archdetect +ethdetect +hw-detect-full +di-utils +di-utils-mapdevfs +debootstrap-udeb +libdevmapper1.00-udeb +dhcp-client-udeb +libdirectfb-0.9-20-udeb +discover-data-udeb +discover-udeb +discover1-data-udeb +discover1-udeb +discover2-data-udeb +e2fsprogs-udeb +libblkid1-udeb +libuuid1-udeb +eject-udeb +evms-udeb +fbset-udeb +libfribidi0-udeb +libc6-udeb +libnss-dns-udeb +libnss-files-udeb +grub-installer +iso-3166-udeb +jfsutils-udeb +kbd-chooser +lilo-installer +cdrom-core-modules-2.6.7-3-generic-di +ext3-modules-2.6.7-3-generic-di +fat-modules-2.6.7-3-generic-di +fb-modules-2.6.7-3-generic-di +firewire-core-modules-2.6.7-3-generic-di +floppy-modules-2.6.7-3-generic-di +ide-core-modules-2.6.7-3-generic-di +ide-modules-2.6.7-3-generic-di +input-modules-2.6.7-3-generic-di +ipv6-modules-2.6.7-3-generic-di +irda-modules-2.6.7-3-generic-di +jfs-modules-2.6.7-3-generic-di +loop-modules-2.6.7-3-generic-di +md-modules-2.6.7-3-generic-di +nic-extra-modules-2.6.7-3-generic-di +nic-modules-2.6.7-3-generic-di +nic-pcmcia-modules-2.6.7-3-generic-di +nic-shared-modules-2.6.7-3-generic-di +nic-usb-modules-2.6.7-3-generic-di +ntfs-modules-2.6.7-3-generic-di +parport-modules-2.6.7-3-generic-di +pcmcia-modules-2.6.7-3-generic-di +pcmcia-storage-modules-2.6.7-3-generic-di +plip-modules-2.6.7-3-generic-di +ppp-modules-2.6.7-3-generic-di +reiserfs-modules-2.6.7-3-generic-di +sata-modules-2.6.7-3-generic-di +scsi-common-modules-2.6.7-3-generic-di +scsi-core-modules-2.6.7-3-generic-di +scsi-extra-modules-2.6.7-3-generic-di +scsi-modules-2.6.7-3-generic-di +serial-modules-2.6.7-3-generic-di +socket-modules-2.6.7-3-generic-di +ufs-modules-2.6.7-3-generic-di +usb-modules-2.6.7-3-generic-di +usb-storage-modules-2.6.7-3-generic-di +xfs-modules-2.6.7-3-generic-di +lowmem +lvm10-udeb +lvm2-udeb +lvmcfg +lvmcfg-utils +libdebian-installer-extra4-udeb +libdebian-installer4-udeb +mdadm-udeb +mdcfg +mdcfg-utils +mii-diag-udeb +module-init-tools-udeb +net-retriever +netcfg +network-console +nobootloader +openssh-client-udeb +openssh-server-udeb +os-prober +partconf-find-partitions +partconf-mkfstab +libparted1.6-udeb +parted-udeb +partman-auto +partman-basicfilesystems +partman-basicmethods +partman-ext3 +partman-jfs +partman-lvm +partman-md +partman-partitioning +partman-reiserfs +partman-target +partman-xfs +partman +pcmcia-cs-udeb +ppp-udeb +prebaseconfig +libreiserfs0.3-udeb +raidtools2-udeb +mkreiserfs-udeb +userdevfs +fdisk-udeb +libiw27-udeb +wireless-tools-udeb +xfsprogs-udeb +#endif /* ARCH_amd64 */ #ifdef ARCH_ia64 archdetect autopartkit Index: tasks/debian-installer+kernel =================================================================== RCS file: /cvs/debian-boot/debian-cd/tasks/debian-installer+kernel,v retrieving revision 1.24 diff -u -r1.24 debian-installer+kernel --- tasks/debian-installer+kernel 6 Oct 2004 20:38:24 -0000 1.24 +++ tasks/debian-installer+kernel 25 Oct 2004 19:26:52 -0000 @@ -40,6 +40,9 @@ kernel-pcmcia-modules-2.4.27-1-386 kernel-image-2.6.8-1-386 #endif +#ifdef ARCH_amd64 +kernel-image-2.6.7-5-amd64-generic +#endif #ifdef ARCH_alpha aboot aboot-base Index: tools/generate_di+k_list =================================================================== RCS file: /cvs/debian-boot/debian-cd/tools/generate_di+k_list,v retrieving revision 1.40 diff -u -r1.40 generate_di+k_list --- tools/generate_di+k_list 5 Oct 2004 01:00:46 -0000 1.40 +++ tools/generate_di+k_list 25 Oct 2004 19:26:52 -0000 @@ -58,6 +58,18 @@ cat >> debian-installer+kernel << EOF #endif +#ifdef ARCH_amd64 +EOF + +/bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \ + >> debian-installer+kernel +/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \ + >> debian-installer+kernel + +cat >> debian-installer+kernel << EOF +#endif #ifdef ARCH_alpha aboot aboot-base Index: tools/generate_di_list =================================================================== RCS file: /cvs/debian-boot/debian-cd/tools/generate_di_list,v retrieving revision 1.9 diff -u -r1.9 generate_di_list --- tools/generate_di_list 11 Jul 2004 15:35:36 -0000 1.9 +++ tools/generate_di_list 25 Oct 2004 19:26:52 -0000 @@ -3,7 +3,7 @@ # This script makes use of the following variables that need to be preset: # MIRROR, DI_CODENAME, BASEDIR my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel - powerpc s390 sparc sh}; + powerpc s390 sparc sh amd64}; my $DATE=`date`; chomp $DATE; open(OUT, ">debian-installer") || die "write: $!"; Index: tools/set_mkisofs_opts =================================================================== RCS file: /cvs/debian-boot/debian-cd/tools/set_mkisofs_opts,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 set_mkisofs_opts --- tools/set_mkisofs_opts 11 Nov 1999 17:10:41 -0000 1.1.1.1 +++ tools/set_mkisofs_opts 25 Oct 2004 19:26:53 -0000 @@ -18,6 +18,9 @@ i386) OPTS="-J" ;; + amd64) + OPTS="-J" + ;; alpha) OPTS="-J" ;;
choose-mirror netcfg ethdetect pcmcia-cs-udeb wireless-tools-udeb
netcfg ethdetect pcmcia-cs-udeb wireless-tools-udeb
netcfg ethdetect pcmcia-cs-udeb wireless-tools-udeb
#!/bin/bash # # Do install stuff for i386, 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 set -e N=$1 CDDIR=$2 BOOTDIR= if [ "$DI_WWW_HOME" = "default" ];then DI_WWW_HOME="http://debian-amd64.alioth.debian.org/debian-installer/daily" fi if [ ! "$DI_DIST" ]; then DI_DIST="$DI_CODENAME" fi cd $CDDIR/.. # # This script is called with $1 (now $N) as the CD to # make bootable. N may be in the form "n" or "n_NONUS" # There may be more than 4 disks...support extras. # Strip NONUS part of disk number # NN will be 1...N so it can be used as an index # NN=`echo $N | sed -e 's/_NONUS//'` # List of boot image for each CD KTYPE[1]="" #isolinux multiboot in fact KTYPE[2]="cdrom" # XXX add net-image back when it's fixed KTYPE[3]="" KTYPE[4]="" KTYPE[5]="" KTYPE[6]="" KTYPE[7]="" KTYPE[8]="" KTYPE[9]="" KTYPE[10]="" THISTYPE=${KTYPE[$NN]} BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz" DISK_IMAGES="" # Download boot images for image in $BOOT_IMAGES $DISK_IMAGES; do if [ ! -e "$image" ]; then dir=$(dirname $image) mkdir -p $dir if [ ! "$DI_WWW_HOME" ];then cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image" else wget "$DI_WWW_HOME/$image" -O "$image" fi fi done if [ "$NN" = "1" ]; then echo "Using ISOLINUX boot-disks image on CD$N" mkdir -p boot$N/isolinux cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/ cp -lf cdrom/vmlinuz $CDDIR/install/ cp -lf cdrom/initrd.gz $CDDIR/install/ echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts else if [ -n "$THISTYPE" ]; then echo "Using $THISTYPE boot-disks image on CD$N" mkdir -p boot$N/boot cp $THISTYPE/boot.img boot$N/boot/ echo -n "-cache-inodes -J -l -b boot/boot.img " > $N.mkisofs_opts else mkdir boot$N echo -n "-cache-inodes -J -l " > $N.mkisofs_opts fi fi #install_languages $CDDIR # Only disk one gets the extra files installed # if [ "$NN" = "1" ]; then # populate the install directory as well for disk in $DISK_IMAGES; do dir=$(dirname $disk) mkdir -p $CDDIR/install/$dir cp -lf $disk $CDDIR/install/$dir done # ISOLINUX setup # Include Smart Boot Manager image for people where isolinux fails gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin # Keep the original file timestamp touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/ # Isolinux help files come from d-i. cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx) mv -f boot$N/isolinux/syslinux.txt boot$N/isolinux/isolinux.txt if [ -e boot$N/isolinux/f3.txt.with26 ];then mv boot$N/isolinux/f3.txt.with26 boot$N/isolinux/f3.txt for image in cdrom/2.6/initrd.gz cdrom/2.6/vmlinuz; do if [ ! -e "$image" ]; then dir=$(dirname $image) mkdir -p $dir if [ ! "$DI_WWW_HOME" ];then cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image" else wget "$DI_WWW_HOME/$image" -O "$image" fi fi done cp -a cdrom/2.6 $CDDIR/install/2.6 # Isolinux config file. cat > boot$N/isolinux/isolinux.cfg <<EOF DEFAULT /install/vmlinuz APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw LABEL linux kernel /install/2.6/vmlinuz append $KERNEL_PARAMS vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw LABEL cdrom kernel /install/vmlinuz LABEL expert kernel /install/2.6/vmlinuz append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw DISPLAY isolinux.txt TIMEOUT 0 PROMPT 1 F1 f1.txt F2 f2.txt F3 f3.txt F4 f4.txt F5 f5.txt F6 f6.txt F7 f7.txt F8 f8.txt F9 f9.txt F0 f10.txt EOF else # Isolinux config file. cat > boot$N/isolinux/isolinux.cfg <<EOF DEFAULT /install/vmlinuz APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw LABEL linux kernel /install/vmlinuz LABEL cdrom kernel /install/vmlinuz LABEL expert kernel /install/vmlinuz append DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw DISPLAY isolinux.txt TIMEOUT 0 PROMPT 1 F1 f1.txt F2 f2.txt F3 f3.txt F4 f4.txt F5 f5.txt F6 f6.txt F7 f7.txt F8 f8.txt F9 f9.txt F0 f10.txt EOF fi (echo "Tools for DOS :" ; \ echo "lodlin/ load Linux kernel from DOS" ;\ echo "rawrite2/ rawrite 2.0 : create disks from disk images (*.bin)"; \ ) |todos > $CDDIR/tools/README.tools # Loadlin script for starting install via dos/windows (cat <<EOF; @ echo off rem Flush any write-cached disk blocks before we leave DOS. If your system does not use smartdrv an error message will appear, you can safely ignore that. smartdrv /c echo using CDROM install loadlin.exe vmlinuz vga=normal initrd=initrd.gz ramdisk_size=8192 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw EOF ) |todos > $CDDIR/install/boot.bat fi # write final lines to mkisofs_opts if [ "$NN" = "1" ]; then echo -n "boot$N " >> $N.mkisofs_opts else if [ -n "$THISTYPE" ]; then echo -n "-c boot/boot.catalog boot$N " >> $N.mkisofs_opts fi fi # th,th, thats all
# These udebs are in the d-i cdrom initrd and the hd-media initrd. # As such, there is no reason to keep another copy of them on the CD # in udeb form. isa-pnp-modules-* socket-modules-* console-keymaps-at console-keymaps-usb discover-data-udeb discover-udeb discover1-data-udeb discover1-udeb fat-modules-* cdrom-core-modules-* cdrom-modules-* ide-modules-* ide-core-modules-* input-modules-* fb-modules-* kbd-chooser usb-modules-* usb-storage-modules-* scsi-core-modules-* # Not needed with the 2.6 kernel on amd64. userdevfs # The speakup kernel modules are not useful unless the access images are # provided. *-speakup-di # These packages are for the old partitioning system, and should not be # included as they confuse users. # Note that partconf-find-partitions is used by lvmcfg-utils, so is not # excluded likewise, partconf-mkfstab is used by autopartkit. partconf partitioner # This is obsolete. discover2-data-udeb