From 4fd1458b036cd64e22d70948e9c9fc13fcd2f67a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2004 17:40:19 +0000 Subject: [PATCH] - Update tasks for 2.4.27 and 2.6.8 kernels. --- debian/changelog | 1 + tasks/debian-installer | 114 +++++++++++++++++----------------- tasks/debian-installer+kernel | 8 +-- tasks/exclude-sarge | 14 +++-- 4 files changed, 71 insertions(+), 66 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7497025..a5c0938c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ debian-cd (2.2.20) UNRELEASED; urgency=low - Updated exclude-udebs to match the current CD initrd package list. - Access floppy reorg. - Sparc daily builds moved to joshk's builds. + - Update tasks for 2.4.27 and 2.6.8 kernels. * Stephen R. Marenka - Add support for m68k reorganization. - Bump m68k 2.4 kernels to 2.4.27. diff --git a/tasks/debian-installer b/tasks/debian-installer index 043aa688..b6e8cf10 100644 --- a/tasks/debian-installer +++ b/tasks/debian-installer @@ -3,7 +3,7 @@ * This list can be generated with the command: * ../tools/generate_di_list * - * Last update: Wed Aug 18 15:52:58 MDT 2004 + * Last update: Mon Sep 13 13:34:28 EDT 2004 */ #ifdef ARCH_alpha aboot-installer @@ -407,7 +407,7 @@ archdetect autopartkit base-installer baseconfig-udeb -brltty-modules-2.4.26-1-386-di +brltty-modules-2.4.27-1-386-di brltty-udeb bterm-unifont bugreporter-udeb @@ -430,25 +430,25 @@ e2fsprogs-udeb eject-udeb ethdetect evms-udeb -ext3-modules-2.4.26-1-386-di -ext3-modules-2.6.7-1-386-di +ext3-modules-2.4.27-1-386-di +ext3-modules-2.6.8-1-386-di fbset-udeb fdisk-udeb -firewire-core-modules-2.4.26-1-386-di -firewire-core-modules-2.6.7-1-386-di -firmware-modules-2.6.7-1-386-di -floppy-modules-2.4.26-1-386-di -floppy-modules-2.6.7-1-386-di +firewire-core-modules-2.4.27-1-386-di +firewire-core-modules-2.6.8-1-386-di +firmware-modules-2.6.8-1-386-di +floppy-modules-2.4.27-1-386-di +floppy-modules-2.6.8-1-386-di grub-installer hdparm-udeb hw-detect-full -ipv6-modules-2.4.26-1-386-di -ipv6-modules-2.6.7-1-386-di -irda-modules-2.4.26-1-386-di -irda-modules-2.6.7-1-386-di +ipv6-modules-2.4.27-1-386-di +ipv6-modules-2.6.8-1-386-di +irda-modules-2.4.27-1-386-di +irda-modules-2.6.8-1-386-di iso-3166-udeb -jfs-modules-2.4.26-1-386-di -jfs-modules-2.6.7-1-386-di +jfs-modules-2.4.27-1-386-di +jfs-modules-2.6.8-1-386-di jfsutils-udeb libblkid1-udeb libc6-udeb @@ -465,15 +465,15 @@ libparted1.6-udeb libreiserfs0.3-udeb libuuid1-udeb lilo-installer -loop-modules-2.4.26-1-386-di -loop-modules-2.6.7-1-386-di +loop-modules-2.4.27-1-386-di +loop-modules-2.6.8-1-386-di lowmem lvm10-udeb lvm2-udeb lvmcfg lvmcfg-utils -md-modules-2.4.26-1-386-di -md-modules-2.6.7-1-386-di +md-modules-2.4.27-1-386-di +md-modules-2.6.8-1-386-di mdadm-udeb mdcfg mdcfg-utils @@ -482,25 +482,25 @@ mkreiserfs-udeb net-retriever netcfg network-console -nic-extra-modules-2.4.26-1-386-di -nic-extra-modules-2.6.7-1-386-di -nic-modules-2.4.26-1-386-di -nic-modules-2.6.7-1-386-di -nic-pcmcia-modules-2.4.26-1-386-di -nic-pcmcia-modules-2.6.7-1-386-di -nic-shared-modules-2.4.26-1-386-di -nic-shared-modules-2.6.7-1-386-di -nic-usb-modules-2.4.26-1-386-di -nic-usb-modules-2.6.7-1-386-di +nic-extra-modules-2.4.27-1-386-di +nic-extra-modules-2.6.8-1-386-di +nic-modules-2.4.27-1-386-di +nic-modules-2.6.8-1-386-di +nic-pcmcia-modules-2.4.27-1-386-di +nic-pcmcia-modules-2.6.8-1-386-di +nic-shared-modules-2.4.27-1-386-di +nic-shared-modules-2.6.8-1-386-di +nic-usb-modules-2.4.27-1-386-di +nic-usb-modules-2.6.8-1-386-di nobootloader -ntfs-modules-2.4.26-1-386-di -ntfs-modules-2.6.7-1-386-di +ntfs-modules-2.4.27-1-386-di +ntfs-modules-2.6.8-1-386-di ntfstools-udeb openssh-client-udeb openssh-server-udeb os-prober -parport-modules-2.4.26-1-386-di -parport-modules-2.6.7-1-386-di +parport-modules-2.4.27-1-386-di +parport-modules-2.6.8-1-386-di partconf-find-partitions partconf-mkfstab parted-udeb @@ -517,34 +517,34 @@ partman-reiserfs partman-target partman-xfs pcmcia-cs-udeb -pcmcia-modules-2.4.26-1-386-di -pcmcia-modules-2.6.7-1-386-di -pcmcia-storage-modules-2.4.26-1-386-di -pcmcia-storage-modules-2.6.7-1-386-di -plip-modules-2.4.26-1-386-di -plip-modules-2.6.7-1-386-di -ppp-modules-2.4.26-1-386-di -ppp-modules-2.6.7-1-386-di +pcmcia-modules-2.4.27-1-386-di +pcmcia-modules-2.6.8-1-386-di +pcmcia-storage-modules-2.4.27-1-386-di +pcmcia-storage-modules-2.6.8-1-386-di +plip-modules-2.4.27-1-386-di +plip-modules-2.6.8-1-386-di +ppp-modules-2.4.27-1-386-di +ppp-modules-2.6.8-1-386-di ppp-udeb prebaseconfig raidtools2-udeb -reiserfs-modules-2.4.26-1-386-di -reiserfs-modules-2.6.7-1-386-di -sata-modules-2.4.26-1-386-di -sata-modules-2.6.7-1-386-di -scsi-common-modules-2.4.26-1-386-di -scsi-common-modules-2.6.7-1-386-di -scsi-extra-modules-2.4.26-1-386-di -scsi-extra-modules-2.6.7-1-386-di -scsi-modules-2.4.26-1-386-di -scsi-modules-2.6.7-1-386-di -serial-modules-2.4.26-1-386-di -serial-modules-2.6.7-1-386-di -ufs-modules-2.4.26-1-386-di -ufs-modules-2.6.7-1-386-di +reiserfs-modules-2.4.27-1-386-di +reiserfs-modules-2.6.8-1-386-di +sata-modules-2.4.27-1-386-di +sata-modules-2.6.8-1-386-di +scsi-common-modules-2.4.27-1-386-di +scsi-common-modules-2.6.8-1-386-di +scsi-extra-modules-2.4.27-1-386-di +scsi-extra-modules-2.6.8-1-386-di +scsi-modules-2.4.27-1-386-di +scsi-modules-2.6.8-1-386-di +serial-modules-2.4.27-1-386-di +serial-modules-2.6.8-1-386-di +ufs-modules-2.4.27-1-386-di +ufs-modules-2.6.8-1-386-di wireless-tools-udeb -xfs-modules-2.4.26-1-386-di -xfs-modules-2.6.7-1-386-di +xfs-modules-2.4.27-1-386-di +xfs-modules-2.6.8-1-386-di xfsprogs-udeb zlib1g-udeb #endif /* ARCH_i386 */ diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel index 878f5f62..e044626f 100644 --- a/tasks/debian-installer+kernel +++ b/tasks/debian-installer+kernel @@ -5,7 +5,7 @@ * This list can be generated with the command: * ../tools/generate_di+k_list * - * Last update: Wed Aug 4 15:44:40 MDT 2004 + * Last update: Mon Sep 13 13:27:20 EDT 2004 */ #include @@ -35,9 +35,9 @@ discover discover1 grub lilo -kernel-image-2.4.26-1-386 -kernel-pcmcia-modules-2.4.26-1-386 -kernel-image-2.6.7-1-386 +kernel-image-2.4.27-1-386 +kernel-pcmcia-modules-2.4.27-1-386 +kernel-image-2.6.8-1-386 #endif #ifdef ARCH_alpha aboot diff --git a/tasks/exclude-sarge b/tasks/exclude-sarge index ae324d27..e33266f9 100644 --- a/tasks/exclude-sarge +++ b/tasks/exclude-sarge @@ -32,7 +32,6 @@ kernel-image-2.4.24-1-k6 kernel-image-2.4.24-1-k7 kernel-image-2.4.24-1-k7-smp kernel-image-2.4.24-speakup -kernel-image-2.4.26-speakup kernel-image-2.4.25-1-386 kernel-image-2.4.25-1-586tsc kernel-image-2.4.25-1-686 @@ -40,7 +39,11 @@ kernel-image-2.4.25-1-686-smp kernel-image-2.4.25-1-k6 kernel-image-2.4.25-1-k7 kernel-image-2.4.25-1-k7-smp +kernel-image-2.4.26-speakup +kernel-image-2.4.26-1-386 kernel-image-2.4.26-1-586tsc +kernel-image-2.4.26-1-686 +kernel-image-2.4.26-1-686-smp kernel-image-2.4.26-1-k6 kernel-image-2.4.26-1-k7 kernel-image-2.4.26-1-k7-smp @@ -48,10 +51,6 @@ kernel-image-2.4.27-1-586tsc kernel-image-2.4.27-1-k6 kernel-image-2.4.27-1-k7 kernel-image-2.4.27-1-k7-smp -kernel-image-2.4.28-1-586tsc -kernel-image-2.4.28-1-k6 -kernel-image-2.4.28-1-k7 -kernel-image-2.4.28-1-k7-smp kernel-image-2.6-386 kernel-image-2.6-686 kernel-image-2.6-686-smp @@ -72,6 +71,8 @@ kernel-image-2.6.6-1-686 kernel-image-2.6.6-1-686-smp kernel-image-2.6.6-1-k7 kernel-image-2.6.6-1-k7-smp +kernel-image-2.6.7-1-386 +kernel-image-2.6.7-1-686 kernel-image-2.6.7-1-k7 kernel-image-2.6.7-1-k7-smp kernel-image-2.6.8-1-k7 @@ -99,7 +100,10 @@ kernel-pcmcia-modules-2.4.25-1-686-smp kernel-pcmcia-modules-2.4.25-1-k6 kernel-pcmcia-modules-2.4.25-1-k7 kernel-pcmcia-modules-2.4.25-1-k7-smp +kernel-pcmcia-modules-2.4.26-1-386 kernel-pcmcia-modules-2.4.26-1-586tsc +kernel-pcmcia-modules-2.4.26-1-686 +kernel-pcmcia-modules-2.4.26-1-686-smp kernel-pcmcia-modules-2.4.26-1-k6 kernel-pcmcia-modules-2.4.26-1-k7 kernel-pcmcia-modules-2.4.26-1-k7-smp