Add 686 kernels to replace 586 for i386 CDs

Makefile

@@ -375,6 +375,9 @@ $(BDIR)/rawlist:
 	if [ "$(EXCLUDE_586_KERNEL)"x = "1"x ] ; then \
 		ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_586_KERNEL"; \
 	fi; \
+	if [ "$(EXCLUDE_686_KERNEL)"x = "1"x ] ; then \
+		ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_686_KERNEL"; \
+	fi; \
 	if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
 		cpp -nostdinc -P -undef $$ARCHDEFS $$VARIANTDEFS\
 	   		$$ARCHUNDEFS -U i386 -U linux -U unix \

debian/changelog

@@ -49,6 +49,9 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
   [ Samuel Thibault ]
   * include espeakup on cd1, not speakup, and alsa-utils. Closes: #809497
 
+  [ Ben Hutchings ]
+  * Add 686 kernels to replace 586 for i386 CDs. Closes: #808958
+
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
 debian-cd (3.1.17) unstable; urgency=medium

tools/generate_di+k_list

@@ -132,6 +132,10 @@ linux-headers-486
 linux-image-586
 linux-headers-586
 #endif
+#ifndef ARCH_i386_EXCLUDE_686_KERNEL
+linux-image-686
+linux-headers-686
+#endif
 
 #endif