[kernel] r9204 - in dists/trunk/linux-2.6/debian: config/alpha config/amd64 config/i386 config/ia64 config/powerpc config/s390 config/sparc lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Fri Jul 27 15:24:24 UTC 2007
Author: waldi
Date: Fri Jul 27 15:24:23 2007
New Revision: 9204
Log:
* debian/config: Set featuresets instead of subarches.
* debian/lib/python/debian_linux/config.py
- Fix some method names.
- Use featuresets insteaf of subarches.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/defines
dists/trunk/linux-2.6/debian/config/amd64/defines
dists/trunk/linux-2.6/debian/config/i386/defines
dists/trunk/linux-2.6/debian/config/ia64/defines
dists/trunk/linux-2.6/debian/config/powerpc/defines
dists/trunk/linux-2.6/debian/config/s390/defines
dists/trunk/linux-2.6/debian/config/sparc/defines
dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
Modified: dists/trunk/linux-2.6/debian/config/alpha/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/defines (original)
+++ dists/trunk/linux-2.6/debian/config/alpha/defines Fri Jul 27 15:24:23 2007
@@ -1,9 +1,9 @@
[base]
+featuresets:
+ vserver
flavours: alpha-generic alpha-smp alpha-legacy
kernel-arch: alpha
kernel-header-dirs: alpha
-subarches:
- vserver
[image]
suggests: aboot, fdutils
Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines Fri Jul 27 15:24:23 2007
@@ -1,12 +1,12 @@
[base]
+featuresets:
+ vserver
+# xen
+# xen-vserver
flavours:
amd64
kernel-arch: x86_64
kernel-header-dirs: x86_64 i386
-subarches:
- vserver
-# xen
-# xen-vserver
[image]
conflicts: grub (<= 0.95+cvs20040624-17)
Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines (original)
+++ dists/trunk/linux-2.6/debian/config/i386/defines Fri Jul 27 15:24:23 2007
@@ -1,4 +1,8 @@
[base]
+featuresets:
+ vserver
+# xen
+# xen-vserver
flavours:
486
686
@@ -7,10 +11,6 @@
amd64
kernel-arch: i386
kernel-header-dirs: i386 x86_64
-subarches:
- vserver
-# xen
-# xen-vserver
[image]
conflicts: grub (<= 0.95+cvs20040624-17)
Modified: dists/trunk/linux-2.6/debian/config/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/defines (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/defines Fri Jul 27 15:24:23 2007
@@ -1,11 +1,11 @@
[base]
+featuresets:
+ vserver
flavours:
itanium
mckinley
kernel-arch: ia64
kernel-header-dirs: ia64
-subarches:
- vserver
[image]
suggests: elilo, fdutils
Modified: dists/trunk/linux-2.6/debian/config/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/defines (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/defines Fri Jul 27 15:24:23 2007
@@ -1,4 +1,6 @@
[base]
+featuresets:
+ vserver
flavours:
powerpc
powerpc-smp
@@ -9,8 +11,6 @@
kernel-header-dirs: powerpc ppc m68k
kernel-arch: powerpc
kpkg-subarch: ppc
-subarches:
- vserver
[image]
type: plain
Modified: dists/trunk/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/defines (original)
+++ dists/trunk/linux-2.6/debian/config/s390/defines Fri Jul 27 15:24:23 2007
@@ -1,12 +1,12 @@
[base]
+featuresets:
+ vserver
flavours:
s390
s390-tape
s390x
kernel-arch: s390
kernel-header-dirs: s390
-subarches:
- vserver
[image]
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
Modified: dists/trunk/linux-2.6/debian/config/sparc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/defines (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/defines Fri Jul 27 15:24:23 2007
@@ -1,11 +1,11 @@
[base]
+featuresets:
+ vserver
flavours:
# sparc32
sparc64
sparc64-smp
kernel-header-dirs: sparc sparc64
-subarches:
- vserver
[image]
suggests: silo, fdutils
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 Jul 27 15:24:23 2007
@@ -33,9 +33,9 @@
'base': {
'arches': SchemaItemList(),
'available': SchemaItemBoolean(),
+ 'featuresets': SchemaItemList(),
'flavours': SchemaItemList(),
'modules': SchemaItemBoolean(),
- 'subarches': SchemaItemList(),
},
'image': {
'configs': SchemaItemList(),
@@ -51,19 +51,20 @@
def __init__(self, dirs = []):
self._dirs = dirs
- self._readBase()
+ self._read_base()
- def _readArch(self, arch):
+ def _read_arch(self, arch):
config = ConfigParser(self.schemas)
- config.read(self.getFiles("%s/%s" % (arch, self.config_name)))
+ config.read(self.get_files("%s/%s" % (arch, self.config_name)))
- subarches = config['base',].get('subarches', [])
+ featuresets = config['base',].get('featuresets', [])
+ print "featuresets", arch, featuresets
flavours = config['base',].get('flavours', [])
for section in iter(config):
real = list(section)
# TODO
- if real[-1] in subarches:
+ if real[-1] in featuresets:
real[0:0] = ['base', arch]
elif real[-1] in flavours:
real[0:0] = ['base', arch, 'none']
@@ -78,28 +79,29 @@
s.update(config[section])
self[tuple(real)] = s
- for subarch in subarches:
- if self.has_key(('base', arch, subarch)):
- avail = self['base', arch, subarch].get('available', True)
+ for featureset in featuresets:
+ if self.has_key(('base', arch, featureset)):
+ avail = self['base', arch, featureset].get('available', True)
else:
avail = True
if avail:
- self._readSubarch(arch, subarch)
+ self._read_subarch(arch, featureset)
base = self['base', arch]
- base['subarches'] = subarches
+ # TODO
+ base['subarches'] = featuresets
if flavours:
- subarches.insert(0, 'none')
+ featuresets.insert(0, 'none')
del base['flavours']
self['base', arch] = base
self['base', arch, 'none'] = {'flavours': flavours}
for flavour in flavours:
- self._readFlavour(arch, 'none', flavour)
+ self._read_flavour(arch, 'none', flavour)
- def _readBase(self):
+ def _read_base(self):
config = ConfigParser(self.schemas)
- config.read(self.getFiles(self.config_name))
+ config.read(self.get_files(self.config_name))
arches = config['base',]['arches']
@@ -117,18 +119,18 @@
except KeyError:
avail = True
if avail:
- self._readArch(arch)
+ self._read_arch(arch)
- def _readFlavour(self, arch, subarch, flavour):
+ def _read_flavour(self, arch, subarch, flavour):
if not self.has_key(('base', arch, subarch, flavour)):
if subarch == 'none':
import warnings
warnings.warn('No config entry for flavour %s, subarch none, arch %s' % (flavour, arch), DeprecationWarning)
self['base', arch, subarch, flavour] = {}
- def _readSubarch(self, arch, subarch):
+ def _read_subarch(self, arch, subarch):
config = ConfigParser(self.schemas)
- config.read(self.getFiles("%s/%s/%s" % (arch, subarch, self.config_name)))
+ config.read(self.get_files("%s/%s/%s" % (arch, subarch, self.config_name)))
flavours = config['base',].get('flavours', [])
@@ -144,9 +146,9 @@
self[tuple(real)] = s
for flavour in flavours:
- self._readFlavour(arch, subarch, flavour)
+ self._read_flavour(arch, subarch, flavour)
- def getFiles(self, name):
+ def get_files(self, name):
return [os.path.join(i, name) for i in self._dirs if i]
def merge(self, section, arch = None, subarch = None, flavour = None):
More information about the Kernel-svn-changes
mailing list