From 7c0db7034b2d1c94721136a515b8f15a3ce38962 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Fri, 31 Oct 2014 15:27:13 +0000
Subject: [PATCH] Add 586 kernels to replace 486 for i386 CDs

---
 Makefile                 | 3 +++
 debian/changelog         | 1 +
 tools/generate_di+k_list | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index af34f800..302282ef 100755
--- a/Makefile
+++ b/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\
diff --git a/debian/changelog b/debian/changelog
index 2002426f..69d37f38 100644
--- a/debian/changelog
+++ b/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
 
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 0bf8681f..2395ece0 100755
--- a/tools/generate_di+k_list
+++ b/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