* debian/config: Move from debian/arch.
* debian/bin/abicheck.py, debian/bin/abiupdate.py, debian/bin/kconfig.py, debian/lib/python/debian_linux/gencontrol.py, debian/rules, debian/rules.real: Use debian/config instead of debian/arch. svn path=/dists/trunk/linux-2.6/; revision=9187
This commit is contained in:
parent
6e4910c131
commit
236826c2eb
|
@ -6,13 +6,13 @@ from debian_linux.config import *
|
|||
|
||||
class checker(object):
|
||||
def __init__(self, dir, arch, subarch, flavour):
|
||||
self.config = ConfigReaderCore(["debian/arch"])
|
||||
self.config = ConfigReaderCore(["debian/config"])
|
||||
self.filename_new = "%s/Module.symvers" % dir
|
||||
abiname = self.config['abi',]['abiname']
|
||||
if subarch == 'none':
|
||||
self.filename_ref = "debian/arch/%s/abi-%s.%s" % (arch, abiname, flavour)
|
||||
self.filename_ref = "debian/config/%s/abi-%s.%s" % (arch, abiname, flavour)
|
||||
else:
|
||||
self.filename_ref = "debian/arch/%s/%s/abi-%s.%s" % (arch, subarch, abiname, flavour)
|
||||
self.filename_ref = "debian/config/%s/%s/abi-%s.%s" % (arch, subarch, abiname, flavour)
|
||||
|
||||
def __call__(self, out):
|
||||
ret = 0
|
||||
|
|
|
@ -47,7 +47,7 @@ class main(object):
|
|||
self.version = changelog.version.linux_version
|
||||
self.version_source = changelog.version.complete
|
||||
|
||||
local_config = config_reader_arch(["debian/arch"])
|
||||
local_config = config_reader_arch(["debian/config"])
|
||||
|
||||
self.abiname = local_config['abi',]['abiname']
|
||||
self.version_abi = self.version + '-' + self.abiname
|
||||
|
@ -107,7 +107,7 @@ class main(object):
|
|||
return filename_out
|
||||
|
||||
def save_abi(self, symbols, arch, subarch, flavour):
|
||||
out = "debian/arch/%s" % arch
|
||||
out = "debian/config/%s" % arch
|
||||
if subarch != 'none':
|
||||
out += "/%s" % subarch
|
||||
out += "/abi-%s.%s" % (self.abiname, flavour)
|
||||
|
|
|
@ -4,7 +4,7 @@ import optparse, os.path, sys
|
|||
from debian_linux.kconfig import *
|
||||
|
||||
def merge(output, *config):
|
||||
config = [os.path.join('debian/arch', c) for c in config]
|
||||
config = [os.path.join('debian/config', c) for c in config]
|
||||
|
||||
kconfig = KconfigFile()
|
||||
for c in config:
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue