From 459c349bce5d73fa12b7e9ca8951d8d36e87775c Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 22 Jan 2010 01:51:30 +0000
Subject: [PATCH] Use i386 flavour configuration files regardless of the
 featureset

svn path=/dists/trunk/linux-2.6/; revision=14979
---
 debian/changelog                                | 2 ++
 debian/config/i386/{none => }/config.486        | 0
 debian/config/i386/{none => }/config.686        | 0
 debian/config/i386/{none => }/config.686-bigmem | 0
 debian/config/i386/defines                      | 3 +++
 5 files changed, 5 insertions(+)
 rename debian/config/i386/{none => }/config.486 (100%)
 rename debian/config/i386/{none => }/config.686 (100%)
 rename debian/config/i386/{none => }/config.686-bigmem (100%)

diff --git a/debian/changelog b/debian/changelog
index a0b15a39d..f47cdd6bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
     (CVE-2009-3939)
   * e1000,e1000e: Discard all fragments of received over-length packets
     (CVE-2009-4536, CVE-2009-4538)
+  * Enable the '686' configuration options in '686-vserver' packages and
+    the '686-bigmem' configuration options in '686-bigmem-vserver' packages
 
   [ Ian Campbell ]
   * xen: Enable up to 32G of guest memory on i386.
diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/config.486
similarity index 100%
rename from debian/config/i386/none/config.486
rename to debian/config/i386/config.486
diff --git a/debian/config/i386/none/config.686 b/debian/config/i386/config.686
similarity index 100%
rename from debian/config/i386/none/config.686
rename to debian/config/i386/config.686
diff --git a/debian/config/i386/none/config.686-bigmem b/debian/config/i386/config.686-bigmem
similarity index 100%
rename from debian/config/i386/none/config.686-bigmem
rename to debian/config/i386/config.686-bigmem
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 367df2eaf..6eb383c94 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -22,6 +22,7 @@ hardware-long: PCs with a 486, Pentium or compatible processor
 [486_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.486
 
 [686_description]
 hardware: modern PCs
@@ -30,6 +31,7 @@ hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core o
 [686_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686
 recommends: libc6-i686
 
 [686-bigmem_description]
@@ -40,6 +42,7 @@ parts: xen
 [686-bigmem_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686-bigmem
 recommends: libc6-i686
 
 [amd64_description]