* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/i386/defines, debian/arch/powerpc/defines, debian/arch/s390/defines, debian/arch/sparc/defines: Enable vserver. * debian/lib/python/debian_linux/config.py: Fix. * debian/patches/features/all/vserver/vs2.2.0-rc1.patch: Remove. * debian/patches/features/all/vserver/vs2.2.0-rc5.patch: Add. * debian/patches/series/1~experimental.1-extra: Update. svn path=/dists/trunk/linux-2.6/; revision=9096
This commit is contained in:
parent
db7352cbca
commit
e7232db362
|
@ -3,7 +3,7 @@ flavours: alpha-generic alpha-smp alpha-legacy
|
|||
kernel-arch: alpha
|
||||
kernel-header-dirs: alpha
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
suggests: aboot, fdutils
|
||||
|
|
|
@ -4,7 +4,7 @@ flavours:
|
|||
kernel-arch: x86_64
|
||||
kernel-header-dirs: x86_64 i386
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
# xen
|
||||
# xen-vserver
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ flavours:
|
|||
kernel-arch: i386
|
||||
kernel-header-dirs: i386 x86_64
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
# xen
|
||||
# xen-vserver
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ kernel-header-dirs: powerpc ppc m68k
|
|||
kernel-arch: powerpc
|
||||
kpkg-subarch: ppc
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
type: plain
|
||||
|
|
|
@ -6,7 +6,7 @@ flavours:
|
|||
kernel-arch: s390
|
||||
kernel-header-dirs: s390
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
|
||||
|
|
|
@ -5,7 +5,7 @@ flavours:
|
|||
sparc64-smp
|
||||
kernel-header-dirs: sparc sparc64
|
||||
subarches:
|
||||
# vserver
|
||||
vserver
|
||||
|
||||
[image]
|
||||
suggests: silo, fdutils
|
||||
|
|
|
@ -152,7 +152,7 @@ class ConfigReaderCore(ConfigReader):
|
|||
self['base', arch, subarch, flavour] = {}
|
||||
|
||||
def _readSubarch(self, arch, subarch):
|
||||
files = self._get_files("%s/%s/%s" % (arch, subarch, self.config_name))
|
||||
files = self.getFiles("%s/%s/%s" % (arch, subarch, self.config_name))
|
||||
config = ConfigParser(self.schema, files)
|
||||
|
||||
flavours = config['base',].get('flavours', [])
|
||||
|
@ -190,10 +190,17 @@ class ConfigParser(object):
|
|||
def __init__(self, schema, files):
|
||||
self.configs = []
|
||||
self.schema = schema
|
||||
for file in files:
|
||||
fps = []
|
||||
for i in files:
|
||||
try:
|
||||
fps.append(file(i))
|
||||
except Exception: pass
|
||||
if not fps:
|
||||
raise RuntimeError("No files found")
|
||||
for f in fps:
|
||||
import ConfigParser
|
||||
config = ConfigParser.ConfigParser()
|
||||
config.read(file)
|
||||
config.readfp(f)
|
||||
self.configs.append(config)
|
||||
|
||||
def __getitem__(self, key):
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,4 +1,4 @@
|
|||
+ features/all/vserver/vs2.2.0-rc1.patch *_vserver *_xen-vserver
|
||||
+ features/all/vserver/vs2.2.0-rc5.patch *_vserver *_xen-vserver
|
||||
+ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
|
||||
+ features/all/xen/vserver-clash.patch *_xen-vserver
|
||||
+ features/all/xen/fedora-2.6.20-48670.patch *_xen *_xen-vserver
|
||||
|
|
Loading…
Reference in New Issue