* 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

@@ -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))

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

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

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

debian/config/mips/defines

@@ -10,9 +10,6 @@ flavours:
 kernel-arch: mips
 
 [image]
-configs:
- kernelarch-mips/config
- mips/config
 initramfs: false
 
 [r4k-ip22_description]

debian/config/mipsel/defines

@@ -9,9 +9,6 @@ flavours:
 kernel-arch: mips
 
 [image]
-configs:
- kernelarch-mips/config
- mipsel/config
 initramfs: false
 
 [r5k-cobalt_description]