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.sh9 Jul 2004 14:50:34 - 1.14
+++ build_all.sh25 Oct 2004 19:26:52 -
@@ -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 - 1.10
+++ update-cd 25 Oct 2004 19:26:52 -
@@ -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 - 1.5
+++ data/sarge/README.html.in 25 Oct 2004 19:26:52 -
@@ -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-sarge1 Oct 2004 15:11:14 - 1.6
+++ tasks/base-sarge25 Oct 2004 19:26:52 -
@@ -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 - 1.22
+++
