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

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

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

Andy Whitcroft-3
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(-)

--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] UBUNTU: [Packaging] drop redundant = from define statements

Andy Whitcroft-3
This = syntax is not supported in older GNU Make versions and the = form
is exactly equivalent to the unannoted define.

Signed-off-by: Andy Whitcroft <[hidden email]>
---
 debian/rules.d/2-binary-arch.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 3200f755bb26..f32b61e2d1fc 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -39,7 +39,7 @@ prepare-%: $(stampdir)/stamp-prepare-%
 build-%: $(stampdir)/stamp-build-%
  @echo Debug: $@
 
-define build_zfs =
+define build_zfs
  #
  # SPL/ZFS wants a fully built kernel before you can configure and build.
  # It seems to be impossible to tease out the application configuration
@@ -74,14 +74,14 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
 
  @touch $@
 
-define install_zfs =
+define install_zfs
  cd $(builddir)/build-$*/spl/module; \
  $(kmake) -C $(builddir)/build-$* SUBDIRS=`pwd` modules_install $(splopts)
  cd $(builddir)/build-$*/zfs/module; \
  $(kmake) -C $(builddir)/build-$* SUBDIRS=`pwd` modules_install $(zfsopts)
 endef
 
-define install_control =
+define install_control
  for which in $(3); \
  do \
  template="$(DROOT)/templates/$(2).$$which.in"; \
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] UBUNTU: [Config] resync flavour-control.stub

Andy Whitcroft-3
In reply to this post by Andy Whitcroft-3
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 debian.xenial/control.d/flavour-control.stub | 47 +++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/debian.xenial/control.d/flavour-control.stub b/debian.xenial/control.d/flavour-control.stub
index 29b9b296d6a2..8cd24d4ac0cf 100644
--- a/debian.xenial/control.d/flavour-control.stub
+++ b/debian.xenial/control.d/flavour-control.stub
@@ -21,19 +21,36 @@
 #
 # XXX: Leave the blank line before the first package!!
 
-Package: linux-image-PKGVER-ABINUM-FLAVOUR
+Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: kernel
 Priority: optional
 Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
-Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod
-Recommends: BOOTLOADER
-Suggests: fdutils, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
+Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base, linux-modules-PKGVER-ABINUM-FLAVOUR
+Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
+Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
+Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
 Description: Linux kernel image for version PKGVER on DESC
- This package contains the Linux kernel image for version PKGVER on
+ This package contains the=SIGN-ME-TXT= Linux kernel image for version PKGVER on
  DESC.
  .
- Also includes the corresponding System.map file, the modules built by the
+ Supports SUPPORTED processors.
+ .
+ TARGET
+ .
+ You likely do not want to install this package directly. Instead, install
+ the linux-FLAVOUR meta-package, which will ensure that upgrades work
+ correctly, and that supporting packages are also installed.
+
+Package: linux-modules-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
+Architecture: ARCH
+Section: kernel
+Priority: optional
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Linux kernel extra modules for version PKGVER on DESC
+ Contains the corresponding System.map file, the modules built by the
  packager, and scripts that try to ensure that the system is not left in an
  unbootable state after an update.
  .
@@ -45,11 +62,12 @@ Description: Linux kernel image for version PKGVER on DESC
  the linux-FLAVOUR meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
 
-Package: linux-image-extra-PKGVER-ABINUM-FLAVOUR
+Package: linux-modules-extra-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda
 Description: Linux kernel extra modules for version PKGVER on DESC
  This package contains the Linux kernel extra modules for version PKGVER on
  DESC.
@@ -67,10 +85,11 @@ Description: Linux kernel extra modules for version PKGVER on DESC
  correctly, and that supporting packages are also installed.
 
 Package: linux-headers-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
+Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
 Provides: linux-headers, linux-headers-3.0
 Description: Linux kernel headers for version PKGVER on DESC
  This package provides kernel header files for version PKGVER on
@@ -79,14 +98,15 @@ Description: Linux kernel headers for version PKGVER on DESC
  This is for sites that want the latest kernel headers.  Please read
  /usr/share/doc/linux-headers-PKGVER-ABINUM/debian.README.gz for details.
 
-Package: linux-image-PKGVER-ABINUM-FLAVOUR-dbgsym
+Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR-dbgsym
+Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}
 Provides: linux-debug
 Description: Linux kernel debug image for version PKGVER on DESC
- This package provides a kernel debug image for version PKGVER on
+ This package provides the=SIGN-ME-TXT= kernel debug image for version PKGVER on
  DESC.
  .
  This is for sites that wish to debug the kernel.
@@ -96,6 +116,7 @@ Description: Linux kernel debug image for version PKGVER on DESC
  unstripped modules.
 
 Package: linux-tools-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: devel
 Priority: optional
@@ -107,6 +128,7 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM
  =HUMAN=.
 
 Package: linux-cloud-tools-PKGVER-ABINUM-FLAVOUR
+Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: devel
 Priority: optional
@@ -116,7 +138,8 @@ Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM
  version locked tools for cloud for version PKGVER-ABINUM on
  =HUMAN=.
 
-Package: SRCPKGNAME-udebs-FLAVOUR
+Package: linux-udebs-FLAVOUR
+Build-Profiles: <!stage1>
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: ARCH
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Kleber Souza
In reply to this post by Andy Whitcroft-3
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(-)
>
We probably need to add to the patches:

BugLink: http://bugs.launchpad.net/bugs/1806380


Acked-by: Kleber Sacilotto de Souza <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Stefan Bader-2
In reply to this post by Andy Whitcroft-3
On 05.02.19 11:32, 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(-)
>
At least the BugLink added, don't think we get explanations beyond the subject
in any patches ever...


Acked-by: Stefan Bader <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

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

Thadeu Lima de Souza Cascardo-3
In reply to this post by Andy Whitcroft-3
Acked-by: Thadeu Lima de Souza Cascardo <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Kleber Souza
In reply to this post by Andy Whitcroft-3
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:

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
 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


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/2] UBUNTU: [Config] resync flavour-control.stub

Kleber Souza
In reply to this post by Andy Whitcroft-3
On 2/5/19 11:32 AM, Andy Whitcroft wrote:

> Signed-off-by: Andy Whitcroft <[hidden email]>
> ---
>  debian.xenial/control.d/flavour-control.stub | 47 +++++++++++++++-----
>  1 file changed, 35 insertions(+), 12 deletions(-)
>
> diff --git a/debian.xenial/control.d/flavour-control.stub b/debian.xenial/control.d/flavour-control.stub
> index 29b9b296d6a2..8cd24d4ac0cf 100644
> --- a/debian.xenial/control.d/flavour-control.stub
> +++ b/debian.xenial/control.d/flavour-control.stub
> @@ -21,19 +21,36 @@
>  #
>  # XXX: Leave the blank line before the first package!!
>  
> -Package: linux-image-PKGVER-ABINUM-FLAVOUR
> +Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR
> +Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
>  Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides}
> -Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod
> -Recommends: BOOTLOADER
> -Suggests: fdutils, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
> +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base, linux-modules-PKGVER-ABINUM-FLAVOUR
> +Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
> +Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
> +Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
>  Description: Linux kernel image for version PKGVER on DESC
> - This package contains the Linux kernel image for version PKGVER on
> + This package contains the=SIGN-ME-TXT= Linux kernel image for version PKGVER on
>   DESC.
>   .
> - Also includes the corresponding System.map file, the modules built by the
> + Supports SUPPORTED processors.
> + .
> + TARGET
> + .
> + You likely do not want to install this package directly. Instead, install
> + the linux-FLAVOUR meta-package, which will ensure that upgrades work
> + correctly, and that supporting packages are also installed.
> +
> +Package: linux-modules-PKGVER-ABINUM-FLAVOUR
> +Build-Profiles: <!stage1>
> +Architecture: ARCH
> +Section: kernel
> +Priority: optional
> +Depends: ${misc:Depends}, ${shlibs:Depends}
> +Description: Linux kernel extra modules for version PKGVER on DESC
> + Contains the corresponding System.map file, the modules built by the
>   packager, and scripts that try to ensure that the system is not left in an
>   unbootable state after an update.
>   .
> @@ -45,11 +62,12 @@ Description: Linux kernel image for version PKGVER on DESC
>   the linux-FLAVOUR meta-package, which will ensure that upgrades work
>   correctly, and that supporting packages are also installed.
>  
> -Package: linux-image-extra-PKGVER-ABINUM-FLAVOUR
> +Package: linux-modules-extra-PKGVER-ABINUM-FLAVOUR
> +Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: kernel
>  Priority: optional
> -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda
> +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda
>  Description: Linux kernel extra modules for version PKGVER on DESC
>   This package contains the Linux kernel extra modules for version PKGVER on
>   DESC.
> @@ -67,10 +85,11 @@ Description: Linux kernel extra modules for version PKGVER on DESC
>   correctly, and that supporting packages are also installed.
>  
>  Package: linux-headers-PKGVER-ABINUM-FLAVOUR
> +Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: devel
>  Priority: optional
> -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
> +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
>  Provides: linux-headers, linux-headers-3.0
>  Description: Linux kernel headers for version PKGVER on DESC
>   This package provides kernel header files for version PKGVER on
> @@ -79,14 +98,15 @@ Description: Linux kernel headers for version PKGVER on DESC
>   This is for sites that want the latest kernel headers.  Please read
>   /usr/share/doc/linux-headers-PKGVER-ABINUM/debian.README.gz for details.
>  
> -Package: linux-image-PKGVER-ABINUM-FLAVOUR-dbgsym
> +Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR-dbgsym
> +Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: devel
>  Priority: optional
>  Depends: ${misc:Depends}
>  Provides: linux-debug
>  Description: Linux kernel debug image for version PKGVER on DESC
> - This package provides a kernel debug image for version PKGVER on
> + This package provides the=SIGN-ME-TXT= kernel debug image for version PKGVER on
>   DESC.
>   .
>   This is for sites that wish to debug the kernel.
> @@ -96,6 +116,7 @@ Description: Linux kernel debug image for version PKGVER on DESC
>   unstripped modules.
>  
>  Package: linux-tools-PKGVER-ABINUM-FLAVOUR
> +Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: devel
>  Priority: optional
> @@ -107,6 +128,7 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM
>   =HUMAN=.
>  
>  Package: linux-cloud-tools-PKGVER-ABINUM-FLAVOUR
> +Build-Profiles: <!stage1>
>  Architecture: ARCH
>  Section: devel
>  Priority: optional
> @@ -116,7 +138,8 @@ Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM
>   version locked tools for cloud for version PKGVER-ABINUM on
>   =HUMAN=.
>  
> -Package: SRCPKGNAME-udebs-FLAVOUR
> +Package: linux-udebs-FLAVOUR
> +Build-Profiles: <!stage1>
>  XC-Package-Type: udeb
>  Section: debian-installer
>  Architecture: ARCH

Hi Andy,

I also changed on this patch the udebs pkg template name to:

  version locked tools for cloud for version PKGVER-ABINUM on
  =HUMAN=.
 
-Package: linux-udebs-FLAVOUR
+Package: SRCPKGNAME-udebs-FLAVOUR
 Build-Profiles: <!stage1>
 XC-Package-Type: udeb
 Section: debian-installer


Kleber



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team