diff -Nru linux-meta-hwe-5.0.0.37.95/debian/changelog linux-meta-hwe-5.3.0.26.95/debian/changelog --- linux-meta-hwe-5.0.0.37.95/debian/changelog 2019-11-14 10:29:34.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/changelog 2019-12-18 15:21:03.000000000 +0000 @@ -1,3 +1,105 @@ +linux-meta-hwe (5.3.0.26.95) bionic; urgency=medium + + * Bump ABI 5.3.0-26 + + -- Kleber Sacilotto de Souza Wed, 18 Dec 2019 16:21:03 +0100 + +linux-meta-hwe (5.3.0.25.94) bionic; urgency=medium + + * Bump ABI 5.3.0-25 + + * Packaging resync (LP: #1786013) + - [Packaging] Add meta-variants support + + -- Kleber Sacilotto de Souza Fri, 06 Dec 2019 11:46:26 +0100 + +linux-meta-hwe (5.3.0.24.93) bionic; urgency=medium + + * Bump upload number. + + -- Kleber Sacilotto de Souza Tue, 26 Nov 2019 12:43:48 +0100 + +linux-meta-hwe-edge (5.3.0.24.91) bionic; urgency=medium + + * Bump ABI 5.3.0-24 + + -- Wen-chien Jesse Sung Fri, 15 Nov 2019 19:02:25 +0800 + +linux-meta-hwe-edge (5.3.0.23.90) bionic; urgency=medium + + * Bump ABI 5.3.0-23 + + -- Stefan Bader Tue, 12 Nov 2019 11:35:30 +0100 + +linux-meta-hwe-edge (5.3.0.22.89) bionic; urgency=medium + + * Respin to include a regression fix. + + -- Stefan Bader Mon, 11 Nov 2019 09:21:10 +0100 + +linux-meta-hwe-edge (5.3.0.22.88) bionic; urgency=medium + + * Bump ABI 5.3.0-22 + + -- Stefan Bader Wed, 06 Nov 2019 18:01:34 +0100 + +linux-meta-hwe-edge (5.3.0.21.87) bionic; urgency=medium + + * Bump ABI 5.3.0-21 + + -- Khalid Elmously Tue, 29 Oct 2019 22:17:33 -0400 + +linux-meta-hwe-edge (5.3.0.20.86) bionic; urgency=medium + + * Bump ABI 5.3.0-20 + + -- Khalid Elmously Fri, 25 Oct 2019 03:22:10 -0400 + +linux-meta-hwe-edge (5.3.0.19.85) bionic; urgency=medium + + * Bump ABI 5.3.0-19 + + -- Thadeu Lima de Souza Cascardo Fri, 18 Oct 2019 12:36:30 -0300 + +linux-meta-hwe-edge (5.3.0.18.84) bionic; urgency=medium + + * Bump ABI 5.3.0-18 + + -- Thadeu Lima de Souza Cascardo Wed, 09 Oct 2019 12:52:18 -0300 + +linux-meta-hwe-edge (5.3.0.12.83) bionic; urgency=medium + + * Bump ABI 5.3.0-12 + + -- Thadeu Lima de Souza Cascardo Tue, 17 Sep 2019 20:59:19 -0300 + +linux-meta-hwe-edge (5.2.0.13.82) bionic; urgency=medium + + * Bump ABI 5.2.0-13 + + -- Thadeu Lima de Souza Cascardo Wed, 21 Aug 2019 09:49:20 -0300 + +linux-meta-hwe-edge (5.2.0.10.81) bionic; urgency=medium + + * Bump ABI 5.2.0-10 + + -- Thadeu Lima de Souza Cascardo Wed, 07 Aug 2019 11:16:32 -0300 + +linux-meta-hwe-edge (5.2.0.9.80) bionic; urgency=medium + + * Bump ABI 5.2.0-9 + + -- Thadeu Lima de Souza Cascardo Sun, 21 Jul 2019 09:54:37 -0300 + +linux-meta-hwe-edge (5.2.0.8.79) bionic; urgency=medium + + * Bump ABI 5.2.0-8 + + * Miscellaneous Ubuntu changes + - [Packaging] Transition snapdragon back to baseline + + -- Thadeu Lima de Souza Cascardo Thu, 18 Jul 2019 11:09:32 -0300 + linux-meta-hwe (5.0.0.37.95) bionic; urgency=medium * Bump ABI 5.0.0-37 @@ -104,6 +206,8 @@ * [Packaging] Transition snapdragon back to baseline + * Bump ABI 5.0.0-21 + -- Stefan Bader Fri, 05 Jul 2019 15:14:58 +0200 linux-meta-hwe (5.0.0.21.77) bionic; urgency=medium diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control linux-meta-hwe-5.3.0.26.95/debian/control --- linux-meta-hwe-5.0.0.37.95/debian/control 2019-11-14 10:29:34.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control 2019-12-18 15:21:03.000000000 +0000 @@ -5,30 +5,9 @@ Standards-Version: 3.9.8 Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, Build-Depends-Arch: - linux-headers-5.0.0-37, - linux-headers-5.0.0-37-generic, -Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta/+git/bionic - -#Package: linux-source-hwe-18.04 -#Architecture: all -#Depends: ${misc:Depends}, linux-source-${kernel-version} -#Description: Linux kernel source with Ubuntu patches -# This package will always depend on the latest Linux kernel source code -# available. The Ubuntu patches have been applied. - -#Package: linux-crashdump-hwe-18.04 -#Architecture: i386 amd64 armhf ppc64el s390x -#Depends: ${misc:Depends}, kdump-tools, grub-pc (>= 1.96+20090611-1ubuntu2) [i386 amd64] | grub-efi-ia32 [i386 amd64] | grub-efi-amd64 [i386 amd64] | grub (>= 0.97-29ubuntu24) [i386 amd64] -#Recommends: apport -#Suggests: crash -#Description: Linux kernel crashdump setup for the latest generic kernel -# This package installs all the needed infrastructure to get crashdumps from -# your running system. If you are experiencing kernel crashes that cannot -# be debugged normally (because the problem is infrequent or panic's the -# system in such a way as to make information gathering impossible), then -# you can install this package to automatically enable capture of the -# vmcore on crashes. - + linux-headers-5.3.0-26, + linux-headers-5.3.0-26-generic, +Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta/+git/bionic -b hwe Package: linux-headers-generic-hwe-18.04 Architecture: i386 amd64 armhf arm64 ppc64el s390x @@ -74,6 +53,50 @@ and headers. +Package: linux-headers-generic-hwe-18.04-edge +Architecture: i386 amd64 armhf arm64 ppc64el s390x +Section: kernel +Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic +Description: Generic Linux kernel headers + This package will always depend on the latest generic kernel headers + available. + +Package: linux-image-generic-hwe-18.04-edge +Architecture: i386 amd64 armhf arm64 ppc64el s390x +Section: kernel +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-modules-extra-${kernel-abi-version}-generic [i386 amd64 arm64 powerpc ppc64el s390x], linux-firmware, intel-microcode [amd64 i386], amd64-microcode [amd64 i386] +Recommends: thermald [i386 amd64] +Description: Generic Linux kernel image + This package will always depend on the latest generic kernel image + available. + +Package: linux-tools-generic-hwe-18.04-edge +Architecture: i386 amd64 armhf arm64 ppc64el s390x +Section: kernel +Provides: linux-tools +Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-generic +Description: Generic Linux kernel tools + This package will always depend on the latest generic kernel tools + available. + +Package: linux-cloud-tools-generic-hwe-18.04-edge +Architecture: i386 amd64 +Section: kernel +Provides: linux-cloud-tools +Depends: ${misc:Depends}, linux-cloud-tools-${kernel-abi-version}-generic +Description: Generic Linux kernel cloud tools + This package will always depend on the latest generic kernel cloud tools + available. + +Package: linux-generic-hwe-18.04-edge +Architecture: i386 amd64 armhf arm64 ppc64el s390x +Section: kernel +Depends: ${misc:Depends}, linux-image-generic-hwe-18.04-edge (= ${binary:Version}), linux-headers-generic-hwe-18.04-edge (= ${binary:Version}) +Description: Complete Generic Linux kernel and headers + This package will always depend on the latest complete generic Linux kernel + and headers. + + Package: linux-headers-generic-lpae-hwe-18.04 Architecture: armhf Section: kernel @@ -109,6 +132,41 @@ and headers. +Package: linux-headers-generic-lpae-hwe-18.04-edge +Architecture: armhf +Section: kernel +Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic-lpae +Description: Generic LPAE Linux kernel headers + This package will always depend on the latest generic-lpae kernel headers + available. + +Package: linux-image-generic-lpae-hwe-18.04-edge +Architecture: armhf +Section: kernel +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic-lpae, linux-firmware +Recommends: thermald [i386 amd64] +Description: Generic LPAE Linux kernel image + This package will always depend on the latest generic-lpae kernel image + available. + +Package: linux-tools-generic-lpae-hwe-18.04-edge +Architecture: armhf +Section: kernel +Provides: linux-tools +Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-generic-lpae +Description: Generic LPAE Linux kernel tools + This package will always depend on the latest generic-lpae kernel tools + available. + +Package: linux-generic-lpae-hwe-18.04-edge +Architecture: armhf +Section: kernel +Depends: ${misc:Depends}, linux-image-generic-lpae-hwe-18.04-edge (= ${binary:Version}), linux-headers-generic-lpae-hwe-18.04-edge (= ${binary:Version}) +Description: Complete Generic LPAE Linux kernel and headers + This package will always depend on the latest complete generic-lpae Linux kernel + and headers. + + Package: linux-headers-lowlatency-hwe-18.04 Architecture: i386 amd64 Section: kernel @@ -153,6 +211,50 @@ available. +Package: linux-headers-lowlatency-hwe-18.04-edge +Architecture: i386 amd64 +Section: kernel +Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-lowlatency +Description: lowlatency Linux kernel headers + This package will always depend on the latest lowlatency kernel headers + available. + +Package: linux-image-lowlatency-hwe-18.04-edge +Architecture: i386 amd64 +Section: kernel +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-lowlatency, linux-firmware, intel-microcode [amd64 i386], amd64-microcode [amd64 i386] +Recommends: thermald [i386 amd64] +Description: lowlatency Linux kernel image + This package will always depend on the latest lowlatency kernel image + available. + +Package: linux-tools-lowlatency-hwe-18.04-edge +Architecture: i386 amd64 +Section: kernel +Provides: linux-tools +Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-lowlatency +Description: lowlatency Linux kernel tools + This package will always depend on the latest lowlatency kernel tools + available. + +Package: linux-cloud-tools-lowlatency-hwe-18.04-edge +Architecture: i386 amd64 +Section: kernel +Provides: linux-cloud-tools +Depends: ${misc:Depends}, linux-cloud-tools-${kernel-abi-version}-lowlatency +Description: lowlatency Linux kernel cloud tools + This package will always depend on the latest lowlatency kernel cloud tools + available. + +Package: linux-lowlatency-hwe-18.04-edge +Architecture: i386 amd64 +Section: kernel +Depends: ${misc:Depends}, linux-image-lowlatency-hwe-18.04-edge (= ${binary:Version}), linux-headers-lowlatency-hwe-18.04-edge (= ${binary:Version}) +Description: Complete lowlatency Linux kernel + This package will always depend on the latest complete lowlatency Linux kernel + available. + + Package: linux-signed-image-generic-hwe-18.04 Architecture: amd64 Section: oldlibs @@ -169,6 +271,22 @@ This package will always depend on the latest complete generic Linux kernel and headers. Signed with the Ubuntu EFI key. +Package: linux-signed-image-generic-hwe-18.04-edge +Architecture: amd64 +Section: oldlibs +Depends: ${misc:Depends}, linux-image-generic-hwe-18.04-edge +Description: Signed Generic Linux kernel image (dummy transitional package) + This package will always depend on the latest generic kernel image + available. Signed with the Ubuntu EFI key. + +Package: linux-signed-generic-hwe-18.04-edge +Architecture: amd64 +Section: oldlibs +Depends: ${misc:Depends}, linux-generic-hwe-18.04-edge +Description: Complete Signed Generic Linux kernel and headers (dummy transitional package) + This package will always depend on the latest complete generic Linux kernel + and headers. Signed with the Ubuntu EFI key. + Package: linux-signed-image-lowlatency-hwe-18.04 Architecture: amd64 Section: oldlibs @@ -186,6 +304,23 @@ and headers. Signed with the Ubuntu EFI key. +Package: linux-signed-image-lowlatency-hwe-18.04-edge +Architecture: amd64 +Section: oldlibs +Depends: ${misc:Depends}, linux-image-lowlatency-hwe-18.04-edge +Description: Signed Lowlatency Linux kernel image (dummy transitional package) + This package will always depend on the latest lowlatency kernel image + available. Signed with the Ubuntu EFI key. + +Package: linux-signed-lowlatency-hwe-18.04-edge +Architecture: amd64 +Section: oldlibs +Depends: ${misc:Depends}, linux-lowlatency-hwe-18.04-edge +Description: Complete Signed Lowlatency Linux kernel and headers (dummy transitional package) + This package will always depend on the latest complete lowlatency Linux kernel + and headers. Signed with the Ubuntu EFI key. + + Package: linux-headers-snapdragon-hwe-18.04 Architecture: arm64 Section: oldlibs @@ -215,6 +350,35 @@ Transitional package for merging back 18.04 snapdragon into baseline +Package: linux-headers-snapdragon-hwe-18.04-edge +Architecture: arm64 +Section: oldlibs +Depends: linux-headers-snapdragon +Description: Linux kernel headers for the Qualcomm Snapdragon 410c architecture (dummy transitional package) + Transitional package for merging back 18.04 snapdragon into baseline + +Package: linux-image-snapdragon-hwe-18.04-edge +Architecture: arm64 +Section: oldlibs +Depends: linux-image-snapdragon +Description: Linux kernel image for the Qualcomm Snapdragon 410c architecture (dummy transitional package) + Transitional package for merging back 18.04 snapdragon into baseline + +Package: linux-tools-snapdragon-hwe-18.04-edge +Architecture: arm64 +Section: oldlibs +Depends: linux-tools-snapdragon +Description: Linux kernel tools for the Qualcomm Snapdragon 410c architecture (dummy transitional package) + Transitional package for merging back 18.04 snapdragon into baseline + +Package: linux-snapdragon-hwe-18.04-edge +Architecture: arm64 +Section: oldlibs +Depends: linux-snapdragon +Description: Complete Linux kernel and headers for the Qualcomm Snapdragon 410c architecture (dummy transitional package) + Transitional package for merging back 18.04 snapdragon into baseline + + Package: linux-headers-virtual-hwe-18.04 Architecture: i386 amd64 arm64 ppc64el s390x Section: kernel @@ -263,3 +427,51 @@ Description: Extra drivers for Virtual Linux kernel image This package will always depend on linux-image-generic. +Package: linux-headers-virtual-hwe-18.04-edge +Architecture: i386 amd64 arm64 ppc64el s390x +Section: kernel +Depends: ${misc:Depends}, linux-headers-generic-hwe-18.04-edge (= ${binary:Version}) +Description: Virtual Linux kernel headers + This package will always depend on linux-headers-generic. + +Package: linux-image-virtual-hwe-18.04-edge +Architecture: i386 amd64 arm64 ppc64el s390x +Section: kernel +Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic +Description: Virtual Linux kernel image + This package will always depend on the latest minimal generic kernel image + used for virtual instances. + +Package: linux-tools-virtual-hwe-18.04-edge +Architecture: i386 amd64 arm64 ppc64el s390x +Section: kernel +Provides: linux-tools +Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}-generic +Description: Virtual Linux kernel tools + This package will always depend on the latest minimal generic kernel tools + used for virtual instances. + +Package: linux-cloud-tools-virtual-hwe-18.04-edge +Architecture: i386 amd64 +Section: kernel +Provides: linux-cloud-tools +Depends: ${misc:Depends}, linux-cloud-tools-${kernel-abi-version}-generic +Description: Virtual Linux kernel cloud tools + This package will always depend on the latest minimal generic kernel cloud tools + used for virtual instances. + +Package: linux-virtual-hwe-18.04-edge +Architecture: i386 amd64 arm64 ppc64el s390x +Section: kernel +Depends: ${misc:Depends}, linux-image-virtual-hwe-18.04-edge (= ${binary:Version}), linux-headers-virtual-hwe-18.04-edge (= ${binary:Version}) +Description: Minimal Generic Linux kernel and headers + This package will always depend on linux-image-virtual and + linux-headers-virtual. + +Package: linux-image-extra-virtual-hwe-18.04-edge +Architecture: i386 amd64 arm64 ppc64el s390x +Section: kernel +Depends: ${misc:Depends}, linux-image-generic-hwe-18.04-edge (= ${binary:Version}) +Description: Extra drivers for Virtual Linux kernel image + This package will always depend on linux-image-generic. + diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.common linux-meta-hwe-5.3.0.26.95/debian/control.common --- linux-meta-hwe-5.0.0.37.95/debian/control.common 2019-08-07 15:12:00.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.common 2019-12-13 08:45:52.000000000 +0000 @@ -7,25 +7,4 @@ Build-Depends-Arch: linux-headers-@kernel-abi-version@, linux-headers-@kernel-abi-version@-generic, -Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta/+git/@SERIES@ - -#Package: linux-source@SUFFIX@ -#Architecture: all -#Depends: ${misc:Depends}, linux-source-${kernel-version} -#Description: Linux kernel source with Ubuntu patches -# This package will always depend on the latest Linux kernel source code -# available. The Ubuntu patches have been applied. - -#Package: linux-crashdump@SUFFIX@ -#Architecture: i386 amd64 armhf ppc64el s390x -#Depends: ${misc:Depends}, kdump-tools, grub-pc (>= 1.96+20090611-1ubuntu2) [i386 amd64] | grub-efi-ia32 [i386 amd64] | grub-efi-amd64 [i386 amd64] | grub (>= 0.97-29ubuntu24) [i386 amd64] -#Recommends: apport -#Suggests: crash -#Description: Linux kernel crashdump setup for the latest generic kernel -# This package installs all the needed infrastructure to get crashdumps from -# your running system. If you are experiencing kernel crashes that cannot -# be debugged normally (because the problem is infrequent or panic's the -# system in such a way as to make information gathering impossible), then -# you can install this package to automatically enable capture of the -# vmcore on crashes. - +Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta/+git/@SERIES@ -b hwe diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.d/generic linux-meta-hwe-5.3.0.26.95/debian/control.d/generic --- linux-meta-hwe-5.0.0.37.95/debian/control.d/generic 2019-04-05 09:48:01.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.d/generic 2019-12-06 10:40:57.000000000 +0000 @@ -1,4 +1,4 @@ -Package: linux-headers-generic@SUFFIX@ +Package: linux-headers-generic${variant:suffix} Architecture: i386 amd64 armhf arm64 ppc64el s390x Section: kernel Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic @@ -6,7 +6,7 @@ This package will always depend on the latest generic kernel headers available. -Package: linux-image-generic@SUFFIX@ +Package: linux-image-generic${variant:suffix} Architecture: i386 amd64 armhf arm64 ppc64el s390x Section: kernel Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-modules-extra-${kernel-abi-version}-generic [i386 amd64 arm64 powerpc ppc64el s390x], linux-firmware, intel-microcode [amd64 i386], amd64-microcode [amd64 i386] @@ -15,7 +15,7 @@ This package will always depend on the latest generic kernel image available. -Package: linux-tools-generic@SUFFIX@ +Package: linux-tools-generic${variant:suffix} Architecture: i386 amd64 armhf arm64 ppc64el s390x Section: kernel Provides: linux-tools @@ -24,7 +24,7 @@ This package will always depend on the latest generic kernel tools available. -Package: linux-cloud-tools-generic@SUFFIX@ +Package: linux-cloud-tools-generic${variant:suffix} Architecture: i386 amd64 Section: kernel Provides: linux-cloud-tools @@ -33,10 +33,10 @@ This package will always depend on the latest generic kernel cloud tools available. -Package: linux-generic@SUFFIX@ +Package: linux-generic${variant:suffix} Architecture: i386 amd64 armhf arm64 ppc64el s390x Section: kernel -Depends: ${misc:Depends}, linux-image-generic@SUFFIX@ (= ${binary:Version}), linux-headers-generic@SUFFIX@ (= ${binary:Version}) +Depends: ${misc:Depends}, linux-image-generic${variant:suffix} (= ${binary:Version}), linux-headers-generic${variant:suffix} (= ${binary:Version}) Description: Complete Generic Linux kernel and headers This package will always depend on the latest complete generic Linux kernel and headers. diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.d/generic-lpae linux-meta-hwe-5.3.0.26.95/debian/control.d/generic-lpae --- linux-meta-hwe-5.0.0.37.95/debian/control.d/generic-lpae 2019-04-05 09:48:01.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.d/generic-lpae 2019-12-06 10:42:41.000000000 +0000 @@ -1,4 +1,4 @@ -Package: linux-headers-generic-lpae@SUFFIX@ +Package: linux-headers-generic-lpae${variant:suffix} Architecture: armhf Section: kernel Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic-lpae @@ -6,7 +6,7 @@ This package will always depend on the latest generic-lpae kernel headers available. -Package: linux-image-generic-lpae@SUFFIX@ +Package: linux-image-generic-lpae${variant:suffix} Architecture: armhf Section: kernel Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic-lpae, linux-firmware @@ -15,7 +15,7 @@ This package will always depend on the latest generic-lpae kernel image available. -Package: linux-tools-generic-lpae@SUFFIX@ +Package: linux-tools-generic-lpae${variant:suffix} Architecture: armhf Section: kernel Provides: linux-tools @@ -24,10 +24,10 @@ This package will always depend on the latest generic-lpae kernel tools available. -Package: linux-generic-lpae@SUFFIX@ +Package: linux-generic-lpae${variant:suffix} Architecture: armhf Section: kernel -Depends: ${misc:Depends}, linux-image-generic-lpae@SUFFIX@ (= ${binary:Version}), linux-headers-generic-lpae@SUFFIX@ (= ${binary:Version}) +Depends: ${misc:Depends}, linux-image-generic-lpae${variant:suffix} (= ${binary:Version}), linux-headers-generic-lpae${variant:suffix} (= ${binary:Version}) Description: Complete Generic LPAE Linux kernel and headers This package will always depend on the latest complete generic-lpae Linux kernel and headers. diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.d/lowlatency linux-meta-hwe-5.3.0.26.95/debian/control.d/lowlatency --- linux-meta-hwe-5.0.0.37.95/debian/control.d/lowlatency 2019-04-05 09:48:01.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.d/lowlatency 2019-12-06 10:43:02.000000000 +0000 @@ -1,4 +1,4 @@ -Package: linux-headers-lowlatency@SUFFIX@ +Package: linux-headers-lowlatency${variant:suffix} Architecture: i386 amd64 Section: kernel Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-lowlatency @@ -6,7 +6,7 @@ This package will always depend on the latest lowlatency kernel headers available. -Package: linux-image-lowlatency@SUFFIX@ +Package: linux-image-lowlatency${variant:suffix} Architecture: i386 amd64 Section: kernel Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-lowlatency, linux-firmware, intel-microcode [amd64 i386], amd64-microcode [amd64 i386] @@ -15,7 +15,7 @@ This package will always depend on the latest lowlatency kernel image available. -Package: linux-tools-lowlatency@SUFFIX@ +Package: linux-tools-lowlatency${variant:suffix} Architecture: i386 amd64 Section: kernel Provides: linux-tools @@ -24,7 +24,7 @@ This package will always depend on the latest lowlatency kernel tools available. -Package: linux-cloud-tools-lowlatency@SUFFIX@ +Package: linux-cloud-tools-lowlatency${variant:suffix} Architecture: i386 amd64 Section: kernel Provides: linux-cloud-tools @@ -33,10 +33,10 @@ This package will always depend on the latest lowlatency kernel cloud tools available. -Package: linux-lowlatency@SUFFIX@ +Package: linux-lowlatency${variant:suffix} Architecture: i386 amd64 Section: kernel -Depends: ${misc:Depends}, linux-image-lowlatency@SUFFIX@ (= ${binary:Version}), linux-headers-lowlatency@SUFFIX@ (= ${binary:Version}) +Depends: ${misc:Depends}, linux-image-lowlatency${variant:suffix} (= ${binary:Version}), linux-headers-lowlatency${variant:suffix} (= ${binary:Version}) Description: Complete lowlatency Linux kernel This package will always depend on the latest complete lowlatency Linux kernel available. diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.d/signed-generic linux-meta-hwe-5.3.0.26.95/debian/control.d/signed-generic --- linux-meta-hwe-5.0.0.37.95/debian/control.d/signed-generic 2019-04-05 09:48:01.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.d/signed-generic 2019-12-06 10:43:37.000000000 +0000 @@ -1,15 +1,15 @@ -Package: linux-signed-image-generic@SUFFIX@ +Package: linux-signed-image-generic${variant:suffix} Architecture: amd64 Section: oldlibs -Depends: ${misc:Depends}, linux-image-generic@SUFFIX@ +Depends: ${misc:Depends}, linux-image-generic${variant:suffix} Description: Signed Generic Linux kernel image (dummy transitional package) This package will always depend on the latest generic kernel image available. Signed with the Ubuntu EFI key. -Package: linux-signed-generic@SUFFIX@ +Package: linux-signed-generic${variant:suffix} Architecture: amd64 Section: oldlibs -Depends: ${misc:Depends}, linux-generic@SUFFIX@ +Depends: ${misc:Depends}, linux-generic${variant:suffix} Description: Complete Signed Generic Linux kernel and headers (dummy transitional package) This package will always depend on the latest complete generic Linux kernel and headers. Signed with the Ubuntu EFI key. diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.d/signed-lowlatency linux-meta-hwe-5.3.0.26.95/debian/control.d/signed-lowlatency --- linux-meta-hwe-5.0.0.37.95/debian/control.d/signed-lowlatency 2019-04-05 09:48:01.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.d/signed-lowlatency 2019-12-06 10:43:50.000000000 +0000 @@ -1,15 +1,15 @@ -Package: linux-signed-image-lowlatency@SUFFIX@ +Package: linux-signed-image-lowlatency${variant:suffix} Architecture: amd64 Section: oldlibs -Depends: ${misc:Depends}, linux-image-lowlatency@SUFFIX@ +Depends: ${misc:Depends}, linux-image-lowlatency${variant:suffix} Description: Signed Lowlatency Linux kernel image (dummy transitional package) This package will always depend on the latest lowlatency kernel image available. Signed with the Ubuntu EFI key. -Package: linux-signed-lowlatency@SUFFIX@ +Package: linux-signed-lowlatency${variant:suffix} Architecture: amd64 Section: oldlibs -Depends: ${misc:Depends}, linux-lowlatency@SUFFIX@ +Depends: ${misc:Depends}, linux-lowlatency${variant:suffix} Description: Complete Signed Lowlatency Linux kernel and headers (dummy transitional package) This package will always depend on the latest complete lowlatency Linux kernel and headers. Signed with the Ubuntu EFI key. diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.d/transitionals-snapdragon linux-meta-hwe-5.3.0.26.95/debian/control.d/transitionals-snapdragon --- linux-meta-hwe-5.0.0.37.95/debian/control.d/transitionals-snapdragon 2019-08-07 15:12:00.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.d/transitionals-snapdragon 2019-12-06 10:44:22.000000000 +0000 @@ -1,25 +1,25 @@ -Package: linux-headers-snapdragon@SUFFIX@ +Package: linux-headers-snapdragon${variant:suffix} Architecture: arm64 Section: oldlibs Depends: linux-headers-snapdragon Description: Linux kernel headers for the Qualcomm Snapdragon 410c architecture (dummy transitional package) Transitional package for merging back 18.04 snapdragon into baseline -Package: linux-image-snapdragon@SUFFIX@ +Package: linux-image-snapdragon${variant:suffix} Architecture: arm64 Section: oldlibs Depends: linux-image-snapdragon Description: Linux kernel image for the Qualcomm Snapdragon 410c architecture (dummy transitional package) Transitional package for merging back 18.04 snapdragon into baseline -Package: linux-tools-snapdragon@SUFFIX@ +Package: linux-tools-snapdragon${variant:suffix} Architecture: arm64 Section: oldlibs Depends: linux-tools-snapdragon Description: Linux kernel tools for the Qualcomm Snapdragon 410c architecture (dummy transitional package) Transitional package for merging back 18.04 snapdragon into baseline -Package: linux-snapdragon@SUFFIX@ +Package: linux-snapdragon${variant:suffix} Architecture: arm64 Section: oldlibs Depends: linux-snapdragon diff -Nru linux-meta-hwe-5.0.0.37.95/debian/control.d/virtual linux-meta-hwe-5.3.0.26.95/debian/control.d/virtual --- linux-meta-hwe-5.0.0.37.95/debian/control.d/virtual 2019-04-05 09:48:01.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/control.d/virtual 2019-12-06 10:44:40.000000000 +0000 @@ -1,11 +1,11 @@ -Package: linux-headers-virtual@SUFFIX@ +Package: linux-headers-virtual${variant:suffix} Architecture: i386 amd64 arm64 ppc64el s390x Section: kernel -Depends: ${misc:Depends}, linux-headers-generic@SUFFIX@ (= ${binary:Version}) +Depends: ${misc:Depends}, linux-headers-generic${variant:suffix} (= ${binary:Version}) Description: Virtual Linux kernel headers This package will always depend on linux-headers-generic. -Package: linux-image-virtual@SUFFIX@ +Package: linux-image-virtual${variant:suffix} Architecture: i386 amd64 arm64 ppc64el s390x Section: kernel Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic @@ -13,7 +13,7 @@ This package will always depend on the latest minimal generic kernel image used for virtual instances. -Package: linux-tools-virtual@SUFFIX@ +Package: linux-tools-virtual${variant:suffix} Architecture: i386 amd64 arm64 ppc64el s390x Section: kernel Provides: linux-tools @@ -22,7 +22,7 @@ This package will always depend on the latest minimal generic kernel tools used for virtual instances. -Package: linux-cloud-tools-virtual@SUFFIX@ +Package: linux-cloud-tools-virtual${variant:suffix} Architecture: i386 amd64 Section: kernel Provides: linux-cloud-tools @@ -31,17 +31,17 @@ This package will always depend on the latest minimal generic kernel cloud tools used for virtual instances. -Package: linux-virtual@SUFFIX@ +Package: linux-virtual${variant:suffix} Architecture: i386 amd64 arm64 ppc64el s390x Section: kernel -Depends: ${misc:Depends}, linux-image-virtual@SUFFIX@ (= ${binary:Version}), linux-headers-virtual@SUFFIX@ (= ${binary:Version}) +Depends: ${misc:Depends}, linux-image-virtual${variant:suffix} (= ${binary:Version}), linux-headers-virtual${variant:suffix} (= ${binary:Version}) Description: Minimal Generic Linux kernel and headers This package will always depend on linux-image-virtual and linux-headers-virtual. -Package: linux-image-extra-virtual@SUFFIX@ +Package: linux-image-extra-virtual${variant:suffix} Architecture: i386 amd64 arm64 ppc64el s390x Section: kernel -Depends: ${misc:Depends}, linux-image-generic@SUFFIX@ (= ${binary:Version}) +Depends: ${misc:Depends}, linux-image-generic${variant:suffix} (= ${binary:Version}) Description: Extra drivers for Virtual Linux kernel image This package will always depend on linux-image-generic. diff -Nru linux-meta-hwe-5.0.0.37.95/debian/rules linux-meta-hwe-5.3.0.26.95/debian/rules --- linux-meta-hwe-5.0.0.37.95/debian/rules 2019-04-05 09:48:01.000000000 +0000 +++ linux-meta-hwe-5.3.0.26.95/debian/rules 2019-12-06 10:39:17.000000000 +0000 @@ -14,7 +14,6 @@ SERIES=$(shell dpkg-parsechangelog | sed -ne 's/^Distribution: *//p' | sed -e 's/-\(security\|updates\|proposed\)$$//') SOURCE=$(shell dpkg-parsechangelog | sed -ne 's/^Source: *//p') SRCSUFFIX=$(shell dpkg-parsechangelog | sed -ne 's/^Source: *linux-meta\(-hwe.*\)/\1/p') -SUFFIX=$(shell dpkg-parsechangelog | sed -ne 's/^Source: *linux-meta\(-hwe\)\(.*\)/\1-18.04\2/p') # 5 digit versions (2.6.38.., 3 digit kernel base versions (2.6.38) KERNEL_VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed -e \ @@ -44,17 +43,29 @@ dh_testroot dh_clean +# Variants -- is prime and implies no suffix. +# Possible elements: -- -edge -lts-18.04 +variants=-hwe-18.04 -hwe-18.04-edge + +define variant_payload +variant="$$(echo '$(variant)' | sed -e 's/--//')"; \ +sed -e "s/\$${variant:suffix}/$$variant/g" <$$i; \ +echo ""; +endef + debian/control: $(control_files) - rm -f debian/control.tmp for i in $^; do \ - sed \ - -e 's/@SERIES@/$(SERIES)/g' \ - -e 's/@SRCSUFFIX@/$(SRCSUFFIX)/g' \ - -e 's/@SUFFIX@/$(SUFFIX)/g' \ - -e 's/@kernel-abi-version@/$(KERNEL_ABI_VERSION)/g' \ - $$i >> debian/control.tmp; \ - echo >> debian/control.tmp; \ - done + if grep -q "{variant:" $$i; then \ + $(foreach variant,$(variants),$(variant_payload)) \ + else \ + cat $$i; \ + echo ""; \ + fi; \ + done | sed \ + -e 's/@SERIES@/$(SERIES)/g' \ + -e 's/@SRCSUFFIX@/$(SRCSUFFIX)/g' \ + -e 's/@kernel-abi-version@/$(KERNEL_ABI_VERSION)/g' \ + >$@.tmp rm -f $@ mv debian/control.tmp $@