Remove the kernel-headers packages from the task list for all but

i386/amd64, reverting the previous change. Several other arches didn't fit.

debian/changelog

@@ -8,8 +8,8 @@ debian-cd (2.2.23) unstable; UNRELEASED
 	- Updated tools/add-bin-doc to stop warnings on this.
     - Added patch from Sven Luther to add a forth script to make
  	  ppc/pegasos easier to boot.  Closes: #311925
-    - Re-add the kernel-headers packages to match kernel images.
-	  Closes: #249386
+    - Re-add the kernel-headers packages to match kernel images (only
+	  on i386 and amd64). Closes: #249386
 	
 debian-cd (2.2.22) unstable; urgency=critical
 

tools/generate_di+k_list

@@ -99,9 +99,6 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
   >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
-  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -112,9 +109,6 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2.6.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
   >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2.6.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
-  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -135,18 +129,6 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2\.6-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
   >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2\.4\..*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
-  >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2\.4-.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
-  >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2\.6\..*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
-  >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2\.6-.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
-  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -160,9 +142,6 @@ for subarch in r4k-ip22 r5k-ip22; do
 		$MIRROR/dists/$CODENAME/main/binary-mips/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel-$DI_CODENAME
-	sed -n 's/Package: \(kernel-headers-.*-.*\)$/\1/p' \
-		$MIRROR/dists/$CODENAME/main/binary-mips/Packages | tail -n 1 \
-                >> debian-installer+kernel-$DI_CODENAME
 done
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -177,9 +156,6 @@ for subarch in r3k-kn02 r4k-kn04; do
 		$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel-$DI_CODENAME
-	sed -n 's/Package: \(kernel-headers-.*-.*\)$/\1/p' \
-		$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages | tail -n 1 \
-                >> debian-installer+kernel-$DI_CODENAME
 done
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -201,10 +177,6 @@ for subarch in powerpc power3 power4 power3-pmac power3-chrp-rs6k \
 		$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel-$DI_CODENAME
-	sed -n 's/Package: \(kernel-headers-.*-.*\)$/\1/p' \
-		$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
-		| grep -- "-$subarch$" | sort -n | tail -n 1 \
-                >> debian-installer+kernel-$DI_CODENAME
 done
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -217,9 +189,6 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
   >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-.*-sparc.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
-  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -231,16 +200,10 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2.2.*-mac\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
-  >> debian-installer+kernel-$DI_CODENAME
 # Get the latest 2.4 kernels, except mac
 /bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \
   grep -v mac >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2.4.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \
-  grep -v mac >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -251,9 +214,6 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \
   >> debian-installer+kernel-$DI_CODENAME
-/bin/sed -n 's/Package: \(kernel-headers-2.4.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \
-  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif