From e531a557c20012415e2303e629cde11e51765c3b Mon Sep 17 00:00:00 2001
From: cd-builder user <debian-cd@lists.debian.org>
Date: Mon, 18 Oct 2010 14:26:39 +0000
Subject: [PATCH] Add tentative support for omitting 486-class kernel bits in a
 build

---
 Makefile                 |  3 +++
 tools/generate_di+k_list | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e4cf68c9..8944a2bb 100755
--- a/Makefile
+++ b/Makefile
@@ -319,6 +319,9 @@ $(BDIR)/rawlist:
 	if [ "$(FORCE_FIRMWARE)"x != "0"x ] ; then \
 		ARCHDEFS="$$ARCHDEFS -DFORCE_FIRMWARE"; \
 	fi; \
+	if [ "$(EXCLUDE_486_KERNEL)"x = "1"x ] ; then \
+		ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_486_KERNEL"; \
+	fi; \
 	if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
 		cat $(TASKDIR)/$(TASK) | \
 		cpp -nostdinc -nostdinc++ -P -undef $$ARCHDEFS $$VARIANTDEFS\
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 6439b588..fa354663 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -109,16 +109,18 @@ libc6-i686
  * Kernel headers are included as third party modules are commonly
  * used on this architecture.
  */
-linux-image-2.6-486
-linux-headers-2.6-486
 linux-image-2.6-686
 linux-headers-2.6-686
-loop-aes-modules-2.6-486
 loop-aes-modules-2.6-686
-atl2-modules-2.6-486
 atl2-modules-2.6-686
-speakup-modules-2.6-486
 speakup-modules-2.6-686
+#ifndef ARCH_i386_EXCLUDE_486_KERNEL
+linux-image-2.6-486
+linux-headers-2.6-486
+loop-aes-modules-2.6-486
+atl2-modules-2.6-486
+speakup-modules-2.6-486
+#endif
 #ifdef VARIANT_xen
 linux-image-2.6-686-bigmem
 linux-headers-2.6-686-bigmem