diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 3dbb0c102..d4ab808e8 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -567,8 +567,7 @@ class Gencontrol(Base): if not version.linux_revision_experimental: raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version)) if distribution.endswith('-security') or distribution.endswith('-lts'): - if (not version.linux_revision_security or - version.linux_revision_backports): + if version.linux_revision_backports or version.linux_revision_other: raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version)) if distribution.endswith('-backports'): if not version.linux_revision_backports: diff --git a/debian/changelog b/debian/changelog index 283846667..f40937768 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ linux (4.16.5-1) UNRELEASED; urgency=medium (CVE-2018-10323) * udeb: Add algif_skcipher to crypto-modules (Closes: #896968) * ext4: fix bitmap position validation (fixes regression in 4.15.17-1) + * debian/lib/python/debian_linux/gencontrol.py: Allow uploads to *-security + with a simple revision [ Vagrant Cascadian ] * [arm64] Add patches to support SATA on Tegra210/Jetson-TX1.