Merge changes from wheezy-backports to reduce the need for source changes
- Add a suite/version sanity-check for backports - Disable building of udebs whenever package version indicates backports svn path=/dists/trunk/linux/; revision=20483
This commit is contained in:
parent
ad5d669ebf
commit
005ac51bc5
|
@ -136,7 +136,10 @@ class Gencontrol(Base):
|
||||||
["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
|
["$(MAKE) -f debian/rules.real install-libc-dev_%s %s" %
|
||||||
(arch, makeflags)])
|
(arch, makeflags)])
|
||||||
|
|
||||||
if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
|
if self.version.linux_revision_backports:
|
||||||
|
# Installer is not (currently) built from backports
|
||||||
|
pass
|
||||||
|
elif os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
|
||||||
if self.changelog[0].distribution == 'UNRELEASED':
|
if self.changelog[0].distribution == 'UNRELEASED':
|
||||||
import warnings
|
import warnings
|
||||||
warnings.warn(u'Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
|
warnings.warn(u'Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
|
||||||
|
@ -421,13 +424,18 @@ class Gencontrol(Base):
|
||||||
distribution = self.changelog[0].distribution
|
distribution = self.changelog[0].distribution
|
||||||
if distribution in ('unstable', ):
|
if distribution in ('unstable', ):
|
||||||
if (version.linux_revision_experimental or
|
if (version.linux_revision_experimental or
|
||||||
version.linux_revision_other):
|
version.linux_revision_backports or
|
||||||
|
version.linux_revision_other):
|
||||||
raise RuntimeError("Can't upload to %s with a version of %s" %
|
raise RuntimeError("Can't upload to %s with a version of %s" %
|
||||||
(distribution, version))
|
(distribution, version))
|
||||||
if distribution in ('experimental', ):
|
if distribution in ('experimental', ):
|
||||||
if not version.linux_revision_experimental:
|
if not version.linux_revision_experimental:
|
||||||
raise RuntimeError("Can't upload to %s with a version of %s" %
|
raise RuntimeError("Can't upload to %s with a version of %s" %
|
||||||
(distribution, version))
|
(distribution, version))
|
||||||
|
if distribution.endswith('-backports'):
|
||||||
|
if not version.linux_revision_backports:
|
||||||
|
raise RuntimeError("Can't upload to %s with a version of %s" %
|
||||||
|
(distribution, version))
|
||||||
|
|
||||||
def process_real_image(self, entry, fields, vars):
|
def process_real_image(self, entry, fields, vars):
|
||||||
entry = self.process_package(entry, vars)
|
entry = self.process_package(entry, vars)
|
||||||
|
|
|
@ -136,6 +136,10 @@ class VersionLinux(Version):
|
||||||
~exp\d+
|
~exp\d+
|
||||||
)
|
)
|
||||||
|
|
|
|
||||||
|
(?P<revision_backports>
|
||||||
|
~bpo\d\d\+\d+
|
||||||
|
)
|
||||||
|
|
|
||||||
(?P<revision_other>
|
(?P<revision_other>
|
||||||
[^-]+
|
[^-]+
|
||||||
)
|
)
|
||||||
|
@ -160,6 +164,7 @@ $
|
||||||
self.linux_upstream_full = self.linux_upstream + (d['update'] or u'')
|
self.linux_upstream_full = self.linux_upstream + (d['update'] or u'')
|
||||||
self.linux_dfsg = d['dfsg']
|
self.linux_dfsg = d['dfsg']
|
||||||
self.linux_revision_experimental = match.group('revision_experimental') and True
|
self.linux_revision_experimental = match.group('revision_experimental') and True
|
||||||
|
self.linux_revision_backports = match.group('revision_backports') and True
|
||||||
self.linux_revision_other = match.group('revision_other') and True
|
self.linux_revision_other = match.group('revision_other') and True
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue