From 9c9eeb612c166a2b1f40505508f9fd4f114f83c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 23 Sep 2004 16:09:03 +0000 Subject: [PATCH] i --- CONF.sh | 8 ++++---- debian/changelog | 2 ++ tasks/debian-installer+kernel | 16 ++++++++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CONF.sh b/CONF.sh index 3b48b9f2..3c8bbde9 100644 --- a/CONF.sh +++ b/CONF.sh @@ -82,7 +82,7 @@ export ARCH=`dpkg --print-installation-architecture` # images, however. Also, if you are using an NFS partition for # some part of this, you must use this option. # Paths to the mirrors -export MIRROR=/ftp/debian +export MIRROR=/home/debian # Comment the following line if you don't have/want non-US #export NONUS=/ftp/debian-non-US @@ -93,14 +93,14 @@ export MIRROR=/ftp/debian #export FORCENONUSONCD1=1 # Path of the temporary directory -export TDIR=/ftp/tmp +export TDIR=/home/joey//tmp # Path where the images will be written -export OUT=/rack/debian-cd +export OUT=/home/joey/tmp/debian-cd # Where we keep the temporary apt stuff. # This cannot reside on an NFS mount. -export APTTMP=/ftp/tmp/apt +export APTTMP=/home/joey/tmp/apt # Do I want to have NONFREE merged in the CD set # export NONFREE=1 diff --git a/debian/changelog b/debian/changelog index bf9c6fa1..35d967cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ debian-cd (2.2.20) UNRELEASED; urgency=low - Remove access floppies to save space on netinsts. Also remove net-drivers floppy and some other things not really needed for install from CD. + - Add 2.6 kernels to ia64 netinst CDs (and incidentially, update to + 2.4.27). * Stephen R. Marenka - Add support for m68k reorganization. - Bump m68k 2.4 kernels to 2.4.27. diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel index e044626f..1d24b329 100644 --- a/tasks/debian-installer+kernel +++ b/tasks/debian-installer+kernel @@ -63,14 +63,22 @@ kernel-image-netbootable #ifdef ARCH_ia64 discover1 initrd-tools -kernel-image-2.4.26-1-itanium -kernel-image-2.4.26-1-itanium-smp -kernel-image-2.4.26-1-mckinley -kernel-image-2.4.26-1-mckinley-smp +kernel-image-2.4.27-1-itanium +kernel-image-2.4.27-1-itanium-smp +kernel-image-2.4.27-1-mckinley +kernel-image-2.4.27-1-mckinley-smp kernel-image-2.4-itanium kernel-image-2.4-itanium-smp kernel-image-2.4-mckinley kernel-image-2.4-mckinley-smp +kernel-image-2.6.8-1-itanium +kernel-image-2.6.8-1-itanium-smp +kernel-image-2.6.8-1-mckinley +kernel-image-2.6.8-1-mckinley-smp +kernel-image-2.6-itanium +kernel-image-2.6-itanium-smp +kernel-image-2.6-mckinley +kernel-image-2.6-mckinley-smp #endif #ifdef ARCH_mips arcboot