APPLIED/cmnt: [trusty/linux-lts-xenial SRU] [PATCH 0/2] switch to a signed-only kernel and add buildinfo

Message ID 286ba634-a69f-21de-dd40-a65bea75863e@canonical.com
State New
Headers show
Series
  • APPLIED/cmnt: [trusty/linux-lts-xenial SRU] [PATCH 0/2] switch to a signed-only kernel and add buildinfo
Related show

Commit Message

Kleber Souza Feb. 7, 2019, 1:24 p.m.
On 2/5/19 11:32 AM, Andy Whitcroft wrote:
> Below are the two patches needed for the trusty/linux-lts-xenial
> backport kernel to match the signed-only and buildinfo patch kits
> applied to xenial/linux.
>
> Note on the next rebase there is a trivial collission in packaging for
> udebs; you should simply take the new bits from the primary packaging
> and then apply these two on top.
>
> -apw
>
> Andy Whitcroft (2):
>   UBUNTU: [Packaging] drop redundant = from define statements
>   UBUNTU: [Config] resync flavour-control.stub
>
>  debian.xenial/control.d/flavour-control.stub | 47 +++++++++++++++-----
>  debian/rules.d/2-binary-arch.mk              |  6 +--
>  2 files changed, 38 insertions(+), 15 deletions(-)
>
Applied to trusty/lts-backport-xenial branch, with the BugLink added and
the following fixup for patch 2/2:

 Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
 Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER,
SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR


Thanks,
Kleber

Patch

diff --git a/debian.xenial/control.d/flavour-control.stub
b/debian.xenial/control.d/flavour-control.stub
index 8cd24d4ac0cf..b0c41cce9ddd 100644
--- a/debian.xenial/control.d/flavour-control.stub
+++ b/debian.xenial/control.d/flavour-control.stub
@@ -27,7 +27,7 @@  Architecture: ARCH
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base,
linux-modules-PKGVER-ABINUM-FLAVOUR
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>=
4.5ubuntu1~14.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR
 Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool