From 5fd7d767be8fcfefcb3337f8e5c8dadb80261623 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 23 Jan 2010 13:11:34 +0000 Subject: [PATCH] debian/config/i386: Fix config names. svn path=/dists/trunk/linux-2.6/; revision=14987 --- debian/config/i386/defines | 3 --- debian/config/i386/vserver/defines | 8 ++++++++ debian/config/i386/xen/defines | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 6eb383c94..367df2eaf 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -22,7 +22,6 @@ 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 @@ -31,7 +30,6 @@ 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] @@ -42,7 +40,6 @@ parts: xen [686-bigmem_image] configs: kernelarch-x86/config-arch-32 - i386/config.686-bigmem recommends: libc6-i686 [amd64_description] diff --git a/debian/config/i386/vserver/defines b/debian/config/i386/vserver/defines index c27b9b6fa..8ac71f540 100644 --- a/debian/config/i386/vserver/defines +++ b/debian/config/i386/vserver/defines @@ -6,3 +6,11 @@ flavours: [image] recommends: util-vserver, libc6-i686 +[686_image] +configs: + i386/none/config.686 + +[686-bigmem_image] +configs: + i386/none/config.686-bigmem + diff --git a/debian/config/i386/xen/defines b/debian/config/i386/xen/defines index d7101bb21..fc10e1f02 100644 --- a/debian/config/i386/xen/defines +++ b/debian/config/i386/xen/defines @@ -18,7 +18,7 @@ hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core, [686_image] configs: - i386/config.686-bigmem + i386/none/config.686-bigmem i386/xen/config recommends: libc6-xen