* debian/bin/gencontrol.py: Generate list of used configs.
* debian/bin/kconfig.py: Only join suplied configs. * debian/rules.real: Use precalculated config list. svn path=/dists/trunk/linux-2.6/; revision=7476
This commit is contained in:
parent
10054bf5f4
commit
e669847ab2
|
@ -165,6 +165,25 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
j = self.substitute(self.templates["image.xen.%s" % i], vars)
|
||||
file("debian/%s.%s" % (packages_own[0]['Package'], i), 'w').write(j)
|
||||
|
||||
def get_config(default, *entry_name):
|
||||
entry_real = ('image',) + entry_name
|
||||
entry = self.config.get(entry_real, None)
|
||||
if entry is None:
|
||||
return default
|
||||
configs = entry.get('configs', None)
|
||||
if configs is None:
|
||||
return default
|
||||
return configs
|
||||
|
||||
kconfig = ['config']
|
||||
kconfig.extend(get_config(["%s/config" % arch], arch))
|
||||
if subarch == 'none':
|
||||
kconfig.extend(get_config(["%s/config.%s" % (arch, flavour)], arch, subarch, flavour))
|
||||
else:
|
||||
kconfig.extend(get_config(["%s/%s/config" % (arch, subarch)], arch, subarch))
|
||||
kconfig.extend(get_config(["%s/%s/config.%s" % (arch, subarch, flavour)], arch, subarch, flavour))
|
||||
makeflags['KCONFIG'] = ' '.join(kconfig)
|
||||
|
||||
cmds_binary_arch = []
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,))
|
||||
if packages_dummy:
|
||||
|
|
|
@ -5,55 +5,13 @@ from debian_linux.abi import *
|
|||
from debian_linux.config import *
|
||||
from debian_linux.kconfig import *
|
||||
|
||||
class checker(object):
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option('-b', '--base', dest = 'base', default = "debian/arch")
|
||||
parser.add_option('-o', '--output', dest = 'output')
|
||||
def merge(output, *config):
|
||||
config = [os.path.join('debian/arch', c) for c in config]
|
||||
|
||||
def __init__(self):
|
||||
options, args = self.parser.parse_args()
|
||||
|
||||
self.base = options.base
|
||||
self.output = options.output
|
||||
|
||||
arch, subarch, flavour = args
|
||||
|
||||
config = config_reader_arch([self.base])
|
||||
|
||||
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 = self._get_config(config, ["%s/config.%s" % (arch, flavour)], arch, subarch, flavour)
|
||||
else:
|
||||
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):
|
||||
config = []
|
||||
config.extend(self.config)
|
||||
config.extend(self.config_arch)
|
||||
config.extend(self.config_subarch)
|
||||
config.extend(self.config_flavour)
|
||||
config = [os.path.join(self.base, c) for c in config]
|
||||
|
||||
if self.output:
|
||||
kconfig = kconfigfile()
|
||||
for c in config:
|
||||
kconfig.read(file(c))
|
||||
file(self.output, "w").write(str(kconfig))
|
||||
else:
|
||||
print '\n'.join(config)
|
||||
|
||||
def _get_config(self, config, default, *entry_name):
|
||||
entry_real = ('image',) + entry_name
|
||||
entry = config.get(entry_real, None)
|
||||
if entry is None:
|
||||
return default
|
||||
configs = entry.get('configs', None)
|
||||
if configs is None:
|
||||
return default
|
||||
return configs
|
||||
kconfig = kconfigfile()
|
||||
for c in config:
|
||||
kconfig.read(file(c))
|
||||
file(output, "w").write(str(kconfig))
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(checker()())
|
||||
sys.exit(merge(*sys.argv[1:]))
|
||||
|
|
|
@ -77,9 +77,8 @@ setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
|||
source-arch: $(STAMPS_DIR)/source
|
||||
source-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||
|
||||
CONFIGS = $(shell PYTHONPATH=$(CURDIR)/debian/lib/python python2.4 debian/bin/kconfig.py "$(ARCH)" "$(SUBARCH)" "$(FLAVOUR)")
|
||||
$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(CONFIGS)
|
||||
python2.4 debian/bin/kconfig.py -o '$@' "$(ARCH)" "$(SUBARCH)" "$(FLAVOUR)"
|
||||
$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(foreach t,$(KCONFIG),debian/arch/$(t))
|
||||
python2.4 debian/bin/kconfig.py '$@' $(KCONFIG)
|
||||
|
||||
$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
|
||||
$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
|
||||
|
|
Loading…
Reference in New Issue