Add 586 kernels to replace 486 for i386 CDs

Makefile

@@ -372,6 +372,9 @@ $(BDIR)/rawlist:
 	if [ "$(EXCLUDE_486_KERNEL)"x = "1"x ] ; then \
 		ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_486_KERNEL"; \
 	fi; \
+	if [ "$(EXCLUDE_586_KERNEL)"x = "1"x ] ; then \
+		ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_586_KERNEL"; \
+	fi; \
 	if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
 		cat $(TASKDIR)/$(TASK) | \
 		cpp -nostdinc -P -undef $$ARCHDEFS $$VARIANTDEFS\

debian/changelog

@@ -4,6 +4,7 @@ debian-cd (3.1.17) UNRELEASED; urgency=medium
   * Provide hashes for uncompressed Translation-* files, and remove the
     uncompressed versions from the output disc. Closes: #767253. Initial
     patch from Michael Vogt - thanks!
+  * Add 586 kernels to replace 486 for i386 CDs
 
  -- Steve McIntyre <93sam@debian.org>  Wed, 29 Oct 2014 17:33:10 +0000
 

tools/generate_di+k_list

@@ -126,6 +126,10 @@ linux-headers-686-pae
 linux-image-486
 linux-headers-486
 #endif
+#ifndef ARCH_i386_EXCLUDE_586_KERNEL
+linux-image-586
+linux-headers-586
+#endif
 
 #endif