svn path=/dists/sid/linux/; revision=21985
This commit is contained in:
parent
6ba4468770
commit
3a891f8597
|
@ -60,7 +60,7 @@ class Gencontrol(Base):
|
||||||
makeflags.update({
|
makeflags.update({
|
||||||
'VERSION': self.version.linux_version,
|
'VERSION': self.version.linux_version,
|
||||||
'UPSTREAMVERSION': self.version.linux_upstream,
|
'UPSTREAMVERSION': self.version.linux_upstream,
|
||||||
'ABINAME': self.abiname,
|
'ABINAME': self.abiname_version + self.abiname_part,
|
||||||
'ABINAME_PART': self.abiname_part,
|
'ABINAME_PART': self.abiname_part,
|
||||||
'SOURCEVERSION': self.version.complete,
|
'SOURCEVERSION': self.version.complete,
|
||||||
})
|
})
|
||||||
|
@ -130,7 +130,7 @@ class Gencontrol(Base):
|
||||||
except KeyError:
|
except KeyError:
|
||||||
abiname_part = self.abiname_part
|
abiname_part = self.abiname_part
|
||||||
makeflags['ABINAME'] = vars['abiname'] = \
|
makeflags['ABINAME'] = vars['abiname'] = \
|
||||||
self.version.linux_upstream + abiname_part
|
self.abiname_version + abiname_part
|
||||||
makeflags['ABINAME_PART'] = abiname_part
|
makeflags['ABINAME_PART'] = abiname_part
|
||||||
|
|
||||||
if foreign_kernel:
|
if foreign_kernel:
|
||||||
|
@ -466,17 +466,21 @@ class Gencontrol(Base):
|
||||||
self.abiname_part = ''
|
self.abiname_part = ''
|
||||||
else:
|
else:
|
||||||
self.abiname_part = '-%s' % self.config['abi', ]['abiname']
|
self.abiname_part = '-%s' % self.config['abi', ]['abiname']
|
||||||
self.abiname = self.version.linux_upstream + self.abiname_part
|
# We need to keep at least three version components to avoid
|
||||||
|
# userland breakage (e.g. #742226, #745984).
|
||||||
|
self.abiname_version = re.sub('^(\d+\.\d+)(?=-|$)', r'\1.0',
|
||||||
|
self.version.linux_upstream)
|
||||||
self.vars = {
|
self.vars = {
|
||||||
'upstreamversion': self.version.linux_upstream,
|
'upstreamversion': self.version.linux_upstream,
|
||||||
'version': self.version.linux_version,
|
'version': self.version.linux_version,
|
||||||
'source_upstream': self.version.upstream,
|
'source_upstream': self.version.upstream,
|
||||||
'source_package': self.changelog[0].source,
|
'source_package': self.changelog[0].source,
|
||||||
'abiname': self.abiname,
|
'abiname': self.abiname_version + self.abiname_part,
|
||||||
}
|
}
|
||||||
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': self.abiname}
|
'abiname': (self.abiname_version +
|
||||||
|
self.abiname_part)}
|
||||||
|
|
||||||
distribution = self.changelog[0].distribution
|
distribution = self.changelog[0].distribution
|
||||||
if distribution in ('unstable', ):
|
if distribution in ('unstable', ):
|
||||||
|
|
|
@ -118,6 +118,7 @@ linux (3.16.7-1) UNRELEASED; urgency=medium
|
||||||
(Closes: #765590)
|
(Closes: #765590)
|
||||||
* rtsx_usb_ms: Use msleep_interruptible() in polling loop (Closes: #765717)
|
* rtsx_usb_ms: Use msleep_interruptible() in polling loop (Closes: #765717)
|
||||||
* Bump ABI to 4
|
* Bump ABI to 4
|
||||||
|
* Add '.0' to the kernel version string (Closes: #742226, #745984)
|
||||||
|
|
||||||
[ Mauricio Faria de Oliveira ]
|
[ Mauricio Faria de Oliveira ]
|
||||||
* [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles
|
* [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles
|
||||||
|
|
Loading…
Reference in New Issue