[kernel] r9308 - in dists/trunk/linux-2.6/debian: . bin lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Thu Aug 16 10:20:09 UTC 2007
Author: waldi
Date: Thu Aug 16 10:20:09 2007
New Revision: 9308
Log:
* debian/bin/gencontrol.py
- Add default settings for config and template dirs.
- Support more than one config dir.
* debian/bin/kconfig.py: Don't longer prefix files.
* debian/lib/python/debian_linux/gencontrol.py:
Drop default config and template dirs.
* debian/rules.real: Don't prefix config files.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/bin/kconfig.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
dists/trunk/linux-2.6/debian/rules.real
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Thu Aug 16 10:20:09 2007
@@ -6,9 +6,10 @@
from debian_linux.debian import *
class Gencontrol(Base):
- def __init__(self):
- super(Gencontrol, self).__init__()
+ def __init__(self, config_dirs = ["debian/config"], template_dirs = ["debian/templates"]):
+ super(Gencontrol, self).__init__(config_dirs = config_dirs, template_dirs = template_dirs)
self.process_changelog()
+ self.config_dirs = config_dirs
def do_main_setup(self, vars, makeflags, extra):
super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
@@ -188,19 +189,25 @@
return entry.get('configs', None)
def check_config_default(fail, f):
- f1 = "debian/config/" + f
- if os.path.exists(f1):
- return [f]
+ for d in self.config_dirs[::-1]:
+ f1 = d + '/' + f
+ if os.path.exists(f1):
+ return [f1]
if fail:
raise RuntimeError("%s unavailable" % f)
return []
def check_config_files(files):
+ ret = []
for f in files:
- f1 = "debian/config/" + f
- if not os.path.exists(f1):
+ for d in self.config_dirs[::-1]:
+ f1 = d + '/' + f
+ if os.path.exists(f1):
+ ret.append(f1)
+ break
+ else:
raise RuntimeError("%s unavailable" % f)
- return files
+ return ret
def check_config(default, fail, *entry_name):
configs = get_config(*entry_name)
@@ -208,7 +215,7 @@
return check_config_default(fail, default)
return check_config_files(configs)
- kconfig = ['config']
+ kconfig = check_config('config', True)
kconfig.extend(check_config("featureset-%s/config" % featureset, False, None, featureset))
kconfig.extend(check_config("%s/config" % arch, True, arch))
kconfig.extend(check_config("%s/config.%s" % (arch, flavour), False, arch, None, flavour))
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 Thu Aug 16 10:20:09 2007
@@ -4,8 +4,6 @@
from debian_linux.kconfig import *
def merge(output, *config):
- config = [os.path.join('debian/config', c) for c in config]
-
kconfig = KconfigFile()
for c in config:
kconfig.read(file(c))
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Thu Aug 16 10:20:09 2007
@@ -24,7 +24,7 @@
class Gencontrol(object):
makefile_targets = ('binary-arch', 'build', 'setup', 'source')
- def __init__(self, config_dirs = ["debian/config"], template_dirs = ["debian/templates"]):
+ def __init__(self, config_dirs, template_dirs):
self.config = ConfigReaderCore(config_dirs)
self.templates = Templates(template_dirs)
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Thu Aug 16 10:20:09 2007
@@ -68,7 +68,7 @@
source-arch: $(STAMPS_DIR)/source
source-featureset: $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
-$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(foreach t,$(KCONFIG),debian/config/$(t))
+$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG)
python2.4 debian/bin/kconfig.py '$@' $(KCONFIG)
$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
More information about the Kernel-svn-changes
mailing list