[kernel] r19545 - in dists/trunk/linux/debian: bin config config/amd64 config/i386 config/mips config/mipsel

[Bastian Blank]

Author: waldi
Date: Mon Nov 26 22:31:06 2012
New Revision: 19545

Log:
* debian/bin/gencontrol.py: Add support for kernelarch specific config.
* debian/config: Remove now implicit definitions.

Modified:
   dists/trunk/linux/debian/bin/gencontrol.py
   dists/trunk/linux/debian/config/README
   dists/trunk/linux/debian/config/amd64/defines
   dists/trunk/linux/debian/config/i386/defines
   dists/trunk/linux/debian/config/mips/defines
   dists/trunk/linux/debian/config/mipsel/defines

Modified: dists/trunk/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/bin/gencontrol.py	Mon Nov 26 22:29:12 2012	(r19544)
+++ dists/trunk/linux/debian/bin/gencontrol.py	Mon Nov 26 22:31:06 2012	(r19545)
@@ -343,6 +343,7 @@
             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))

Modified: dists/trunk/linux/debian/config/README
==============================================================================
--- dists/trunk/linux/debian/config/README	Mon Nov 26 22:29:12 2012	(r19544)
+++ dists/trunk/linux/debian/config/README	Mon Nov 26 22:31:06 2012	(r19545)
@@ -3,6 +3,7 @@
 
 Config files are included in the following order:
 - config
+- kernelarch-%kernel-arch/config
 - %arch/config
 - %arch/config.%flavour
 - featureset-%featureset/config

Modified: dists/trunk/linux/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux/debian/config/amd64/defines	Mon Nov 26 22:29:12 2012	(r19544)
+++ dists/trunk/linux/debian/config/amd64/defines	Mon Nov 26 22:31:06 2012	(r19545)
@@ -11,7 +11,6 @@
 [image]
 bootloaders: grub-pc extlinux lilo
 configs:
- kernelarch-x86/config
 
 [amd64_description]
 hardware: 64-bit PCs

Modified: dists/trunk/linux/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux/debian/config/i386/defines	Mon Nov 26 22:29:12 2012	(r19544)
+++ dists/trunk/linux/debian/config/i386/defines	Mon Nov 26 22:31:06 2012	(r19545)
@@ -16,7 +16,6 @@
 [image]
 bootloaders: grub-pc extlinux lilo
 configs:
- kernelarch-x86/config
 
 [486_description]
 hardware: older PCs

Modified: dists/trunk/linux/debian/config/mips/defines
==============================================================================
--- dists/trunk/linux/debian/config/mips/defines	Mon Nov 26 22:29:12 2012	(r19544)
+++ dists/trunk/linux/debian/config/mips/defines	Mon Nov 26 22:31:06 2012	(r19545)
@@ -10,9 +10,6 @@
 kernel-arch: mips
 
 [image]
-configs:
- kernelarch-mips/config
- mips/config
 initramfs: false
 
 [r4k-ip22_description]

Modified: dists/trunk/linux/debian/config/mipsel/defines
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/defines	Mon Nov 26 22:29:12 2012	(r19544)
+++ dists/trunk/linux/debian/config/mipsel/defines	Mon Nov 26 22:31:06 2012	(r19545)
@@ -9,9 +9,6 @@
 kernel-arch: mips
 
 [image]
-configs:
- kernelarch-mips/config
- mipsel/config
 initramfs: false
 
 [r5k-cobalt_description]