Message ID | 20190205103227.6048-3-apw@canonical.com |
---|---|
State | New |
Headers | show |
Series | switch to a signed-only kernel and add buildinfo | expand |
On 2/5/19 11:32 AM, Andy Whitcroft wrote: > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > 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
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
Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian.xenial/control.d/flavour-control.stub | 47 +++++++++++++++----- 1 file changed, 35 insertions(+), 12 deletions(-)