diff --git a/debian/changelog b/debian/changelog index 65b4eac9..3cca3d8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low Closes: #240458 - Include debian-installer+kernel into Debian_sarge task to ensure all debs as well as udebs used by d-i are included. + - Exclude newer versions of i386 kernels to save space. Leave 2.6.x-386 + kernels on the CD. * Petter Reinholdtsen - Regenereated tasks/popularity-contest-sarge based on the current data. - Avoid kernel versions 2.4.24 and 2.6.3 on the first i386 CD, as we diff --git a/tasks/exclude-sarge b/tasks/exclude-sarge index 631b5a70..2739f606 100644 --- a/tasks/exclude-sarge +++ b/tasks/exclude-sarge @@ -32,15 +32,43 @@ 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 +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-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 kernel-image-2.6-386 kernel-image-2.6-686 kernel-image-2.6-686-smp kernel-image-2.6-k7 kernel-image-2.6-k7-smp +kernel-image-2.6.3-1-386 kernel-image-2.6.3-1-686 kernel-image-2.6.3-1-686-smp kernel-image-2.6.3-1-k7 kernel-image-2.6.3-1-k7-smp +kernel-image-2.6.5-1-386 +kernel-image-2.6.5-1-686 +kernel-image-2.6.5-1-686-smp +kernel-image-2.6.5-1-k7 +kernel-image-2.6.5-1-k7-smp +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-686 +kernel-image-2.6.7-1-686-smp +kernel-image-2.6.7-1-k7 +kernel-image-2.6.7-1-k7-smp kernel-pcmcia-modules-2.4-386 kernel-pcmcia-modules-2.4-586tsc kernel-pcmcia-modules-2.4-686 @@ -55,6 +83,19 @@ kernel-pcmcia-modules-2.4.24-1-686-smp kernel-pcmcia-modules-2.4.24-1-k6 kernel-pcmcia-modules-2.4.24-1-k7 kernel-pcmcia-modules-2.4.24-1-k7-smp +kernel-pcmcia-modules-2.4.25-1-386 +kernel-pcmcia-modules-2.4.25-1-586tsc +kernel-pcmcia-modules-2.4.25-1-686 +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-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 python2.1 smail tcl8.0