From 7c1154be9114bf6bafc3e1a0c799ec58515e76e6 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Mon, 26 Nov 2012 22:31:06 +0000
Subject: [PATCH] * debian/bin/gencontrol.py: Add support for kernelarch
 specific config. * debian/config: Remove now implicit definitions.

svn path=/dists/trunk/linux/; revision=19545
---
 debian/bin/gencontrol.py     | 1 +
 debian/config/README         | 1 +
 debian/config/amd64/defines  | 1 -
 debian/config/i386/defines   | 1 -
 debian/config/mips/defines   | 3 ---
 debian/config/mipsel/defines | 3 ---
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 95a2e6101..a419789d9 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -343,6 +343,7 @@ class Gencontrol(Base):
             return check_config_files(configs)
 
         kconfig = check_config('config', True)
+        kconfig.extend(check_config("kernelarch-%s/config" % config_entry_base['kernel-arch'], False))
         kconfig.extend(check_config("%s/config" % arch, True, arch))
         kconfig.extend(check_config("%s/config.%s" % (arch, flavour), False, arch, None, flavour))
         kconfig.extend(check_config("featureset-%s/config" % featureset, False, None, featureset))
diff --git a/debian/config/README b/debian/config/README
index aa6e9b129..cc02902b0 100644
--- a/debian/config/README
+++ b/debian/config/README
@@ -3,6 +3,7 @@ Config files
 
 Config files are included in the following order:
 - config
+- kernelarch-%kernel-arch/config
 - %arch/config
 - %arch/config.%flavour
 - featureset-%featureset/config
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 6b8fd4ab8..3e9c18a09 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -11,7 +11,6 @@ debug-info: true
 [image]
 bootloaders: grub-pc extlinux lilo
 configs:
- kernelarch-x86/config
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 30802b4a6..e978f0e97 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -16,7 +16,6 @@ part-long-pae: This kernel requires PAE (Physical Address Extension).
 [image]
 bootloaders: grub-pc extlinux lilo
 configs:
- kernelarch-x86/config
 
 [486_description]
 hardware: older PCs
diff --git a/debian/config/mips/defines b/debian/config/mips/defines
index ee65d8872..5d62cef5c 100644
--- a/debian/config/mips/defines
+++ b/debian/config/mips/defines
@@ -10,9 +10,6 @@ flavours:
 kernel-arch: mips
 
 [image]
-configs:
- kernelarch-mips/config
- mips/config
 initramfs: false
 
 [r4k-ip22_description]
diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines
index c96622ee0..031a2de4f 100644
--- a/debian/config/mipsel/defines
+++ b/debian/config/mipsel/defines
@@ -9,9 +9,6 @@ flavours:
 kernel-arch: mips
 
 [image]
-configs:
- kernelarch-mips/config
- mipsel/config
 initramfs: false
 
 [r5k-cobalt_description]