Author: waldi Date: Fri Sep 8 09:09:17 2006 New Revision: 7369 Modified: dists/trunk/linux-2.6/debian/bin/kconfig.py dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
Log: * debian/bin/kconfig.py: Make it possible to specify which configs to use. * debian/lib/python/debian_linux/config.py - Fix flavour specific sections in subarch config. - Add configs entry. Modified: dists/trunk/linux-2.6/debian/bin/kconfig.py ============================================================================== --- dists/trunk/linux-2.6/debian/bin/kconfig.py (original) +++ dists/trunk/linux-2.6/debian/bin/kconfig.py Fri Sep 8 09:09:17 2006 @@ -7,16 +7,16 @@ class checker(object): def __init__(self, arch, subarch, flavour): - self.config = config_reader_arch(["debian/arch"]) + config = config_reader_arch(["debian/arch"]) - self.config = ["debian/arch/config"] - self.config_arch = ["debian/arch/%s/config" % arch] + self.config = self._get_config(config, ["config"]) + self.config_arch = self._get_config(config, ["%s/config" % arch], arch) if subarch == 'none': self.config_subarch = [] - self.config_flavour = ["debian/arch/%s/config.%s" % (arch, flavour)] + self.config_flavour = self._get_config(config, ["%s/config.%s" % (arch, flavour)], arch, subarch, flavour) else: - self.config_subarch = ["debian/arch/%s/%s/config" % (arch, subarch)] - self.config_flavour = ["debian/arch/%s/%s/config.%s" % (arch, subarch, flavour)] + self.config_subarch = self._get_config(config, ["%s/%s/config" % (arch, subarch)], arch, subarch) + self.config_flavour = self._get_config(config, ["%s/%s/config.%s" % (arch, subarch, flavour)], arch, subarch, flavour) def __call__(self, out): config = [] @@ -27,9 +27,22 @@ kconfig = kconfigfile() for c in config: - kconfig.read(file(c)) + kconfig.read(file("debian/arch/%s" % c)) out.write(str(kconfig)) + def _get_config(self, config, default, *entry_name): + entry_real = ('image',) + entry_name + print entry_real + entry = config.get(entry_real, None) + if entry is None: + return default + print entry + configs = entry.get('configs', None) + if configs is None: + return default + print configs + return configs + if __name__ == '__main__': sys.exit(checker(*sys.argv[1:])(sys.stdout)) Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py ============================================================================== --- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py (original) +++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py Fri Sep 8 09:09:17 2006 @@ -65,6 +65,7 @@ schema = { 'arches': schema_item_list(), 'available': schema_item_boolean(), + 'configs': schema_item_list(), 'flavours': schema_item_list(), 'initramfs': schema_item_boolean(), 'initramfs-generators': schema_item_list(), @@ -159,7 +160,7 @@ if real[-1] in flavours: real[0:0] = ['base', arch, subarch] else: - real[0:] = [real.pop(), arch, subarch] + real[0:0] = [real.pop(), arch, subarch] real = tuple(real) s = self.get(real, {}) s.update(config[section]) _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes