Fix inconsistent ABI name generation in debian/bin/{abiupdate,buildcheck,gencontrol}.py (Closes: #773233)
svn path=/dists/sid/linux/; revision=22199
This commit is contained in:
parent
feb126f084
commit
eb1f86e012
|
@ -68,9 +68,9 @@ class Main(object):
|
||||||
self.version = changelog.version.linux_version
|
self.version = changelog.version.linux_version
|
||||||
self.version_source = changelog.version.complete
|
self.version_source = changelog.version.complete
|
||||||
|
|
||||||
local_config = ConfigCoreDump(fp=open("debian/config.defines.dump", "rb"))
|
self.config = ConfigCoreDump(fp=open("debian/config.defines.dump", "rb"))
|
||||||
|
|
||||||
self.version_abi = local_config['version', ]['abiname']
|
self.version_abi = self.config['version', ]['abiname']
|
||||||
|
|
||||||
def __call__(self):
|
def __call__(self):
|
||||||
self.dir = tempfile.mkdtemp(prefix='abiupdate')
|
self.dir = tempfile.mkdtemp(prefix='abiupdate')
|
||||||
|
@ -99,13 +99,18 @@ class Main(object):
|
||||||
return base_out
|
return base_out
|
||||||
|
|
||||||
def get_abi(self, arch, prefix):
|
def get_abi(self, arch, prefix):
|
||||||
filename = "linux-headers-%s-%s_%s_%s.deb" % (self.version_abi, prefix, self.version_source, arch)
|
try:
|
||||||
|
version_abi = (self.config['version',]['abiname_base'] + '-' +
|
||||||
|
self.config['abi', arch]['abiname'])
|
||||||
|
except KeyError:
|
||||||
|
version_abi = self.version_abi
|
||||||
|
filename = "linux-headers-%s-%s_%s_%s.deb" % (version_abi, prefix, self.version_source, arch)
|
||||||
f = self.retrieve_package(self.url, filename, arch)
|
f = self.retrieve_package(self.url, filename, arch)
|
||||||
d = self.extract_package(f, "linux-headers-%s_%s" % (prefix, arch))
|
d = self.extract_package(f, "linux-headers-%s_%s" % (prefix, arch))
|
||||||
f1 = d + "/usr/src/linux-headers-%s-%s/Module.symvers" % (self.version_abi, prefix)
|
f1 = d + "/usr/src/linux-headers-%s-%s/Module.symvers" % (version_abi, prefix)
|
||||||
s = Symbols(open(f1))
|
s = Symbols(open(f1))
|
||||||
shutil.rmtree(d)
|
shutil.rmtree(d)
|
||||||
return s
|
return version_abi, s
|
||||||
|
|
||||||
def get_config(self):
|
def get_config(self):
|
||||||
filename = "linux-support-%s_%s_all.deb" % (self.version_abi, self.version_source)
|
filename = "linux-support-%s_%s_all.deb" % (self.version_abi, self.version_source)
|
||||||
|
@ -129,8 +134,8 @@ class Main(object):
|
||||||
f_out.write(r)
|
f_out.write(r)
|
||||||
return filename_out
|
return filename_out
|
||||||
|
|
||||||
def save_abi(self, symbols, arch, featureset, flavour):
|
def save_abi(self, version_abi, symbols, arch, featureset, flavour):
|
||||||
dir = "debian/abi/%s" % self.version_abi
|
dir = "debian/abi/%s" % version_abi
|
||||||
if not os.path.exists(dir):
|
if not os.path.exists(dir):
|
||||||
os.makedirs(dir)
|
os.makedirs(dir)
|
||||||
out = "%s/%s_%s_%s" % (dir, arch, featureset, flavour)
|
out = "%s/%s_%s_%s" % (dir, arch, featureset, flavour)
|
||||||
|
@ -170,8 +175,8 @@ class Main(object):
|
||||||
else:
|
else:
|
||||||
localversion = featureset + '-' + flavour
|
localversion = featureset + '-' + flavour
|
||||||
|
|
||||||
abi = self.get_abi(arch, localversion)
|
version_abi, abi = self.get_abi(arch, localversion)
|
||||||
self.save_abi(abi, arch, featureset, flavour)
|
self.save_abi(version_abi, abi, arch, featureset, flavour)
|
||||||
self.log("Ok.\n")
|
self.log("Ok.\n")
|
||||||
except HTTPError as e:
|
except HTTPError as e:
|
||||||
self.log("Failed to retrieve %s: %s\n" % (e.filename, e))
|
self.log("Failed to retrieve %s: %s\n" % (e.filename, e))
|
||||||
|
|
|
@ -44,13 +44,11 @@ class CheckAbi(object):
|
||||||
|
|
||||||
self.filename_new = "%s/Module.symvers" % dir
|
self.filename_new = "%s/Module.symvers" % dir
|
||||||
|
|
||||||
upstream_version = self.config['version',]['upstream']
|
|
||||||
try:
|
try:
|
||||||
version_abi = (upstream_version + '-' +
|
version_abi = (self.config['version',]['abiname_base'] + '-' +
|
||||||
self.config['abi', arch]['abiname'])
|
self.config['abi', arch]['abiname'])
|
||||||
except KeyError:
|
except KeyError:
|
||||||
version_abi = (upstream_version + '-' +
|
version_abi = self.config['version',]['abiname']
|
||||||
self.config['abi', ]['abiname'])
|
|
||||||
self.filename_ref = "debian/abi/%s/%s_%s_%s" % (version_abi, arch, featureset, flavour)
|
self.filename_ref = "debian/abi/%s/%s_%s_%s" % (version_abi, arch, featureset, flavour)
|
||||||
|
|
||||||
def __call__(self, out):
|
def __call__(self, out):
|
||||||
|
|
|
@ -477,6 +477,7 @@ class Gencontrol(Base):
|
||||||
}
|
}
|
||||||
self.config['version', ] = {'source': self.version.complete,
|
self.config['version', ] = {'source': self.version.complete,
|
||||||
'upstream': self.version.linux_upstream,
|
'upstream': self.version.linux_upstream,
|
||||||
|
'abiname_base': self.abiname_version,
|
||||||
'abiname': (self.abiname_version +
|
'abiname': (self.abiname_version +
|
||||||
self.abiname_part)}
|
self.abiname_part)}
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,8 @@ linux (3.16.7-ckt2-2) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* [sh4] Build with gcc-4.8 (Closes: #772602)
|
* [sh4] Build with gcc-4.8 (Closes: #772602)
|
||||||
|
* Fix inconsistent ABI name generation in
|
||||||
|
debian/bin/{abiupdate,buildcheck,gencontrol}.py (Closes: #773233)
|
||||||
|
|
||||||
[ Ian Campbell ]
|
[ Ian Campbell ]
|
||||||
* [armhf] Enable support for support OMAP5432 uEVM by enabling:
|
* [armhf] Enable support for support OMAP5432 uEVM by enabling:
|
||||||
|
|
Loading…
Reference in New Issue