[kernel] r19553 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor

Bastian Blank waldi at alioth.debian.org
Tue Nov 27 18:52:21 UTC 2012


Author: waldi
Date: Tue Nov 27 18:52:21 2012
New Revision: 19553

Log:
lib/kconfigeditor/package.py
- Add schema override.
- Handle kernelarch specific config files.

Modified:
   people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py

Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py	Tue Nov 27 18:40:40 2012	(r19552)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py	Tue Nov 27 18:52:21 2012	(r19553)
@@ -28,8 +28,15 @@
 
         data = imp.find_module('config', [os.path.join(root, 'debian', 'lib', 'python', 'debian_linux')])
         module = imp.load_module('config', *data)
+
+        config_schema = {
+            'image': {
+                'configs': module.SchemaItemList(),
+            },
+        }
+
         self.config_root = os.path.join(root, "debian/config")
-        self.config = module.ConfigCoreHierarchy([self.config_root])
+        self.config = module.ConfigCoreHierarchy(config_schema, (self.config_root, ))
 
         self.files = files = {}
 
@@ -61,6 +68,9 @@
         for filename in self._check_config("%s/config" % arch, arch):
             yield filename, key, kernelarch
 
+        for filename in self._check_config("kernelarch-%s/config" % kernelarch, arch):
+            yield filename, key, kernelarch
+
         for featureset in self.config['base', arch].get('featuresets', ()):
             for data in self._collect_featureset(arch, featureset):
                 yield data



More information about the Kernel-svn-changes mailing list