Applied: [kernel-versions][PATCH] Split hwe modules into :hwe mappings in backwards and forwards compatible way
Dimitri John Ledkov
dimitri.ledkov at canonical.com
Fri May 13 15:10:28 UTC 2022
These changes are based on "build backport-iwlwifi-dkms as
linux-modules-iwlwifi-ABI", are backwards and forwards compatible, and
allow us to start landing building these new additional modules in the
unstable, devel, and oem kernels.
I also want to land these in kinetic v5.15 forward port, before
landing them in jammy:linux. If that is possible to do next week.
--
okurrr,
Dimitri
On Fri, 13 May 2022 at 15:42, Dimitri John Ledkov
<dimitri.ledkov at canonical.com> wrote:
>
> * Create :hwe dkms-versions file mappings
> * Move v4l2loopback module from :main to :hwe dkms-versions files
> * Add backport-iwlwifi-dkms module to :hwe dkms-versions files
> * Create additional mapping files pointing generic, lowlatency, oem,
> intel-iotg kernels at the :hwe dkms-versions mappings
>
> For all existing kernels and packaging above changes are no-op with
> current debian* packaging. This is because existing packaging reads
> the first two fields of their mapping files only, and attempts to only
> build explicitely known modules only (zfs and optionally
> v4l2loopback).
>
> The net effect is that most kernels that only build zfs, will only
> have zfs listed in their dkms-versions file. And the kernels that HWE
> team contributes hardware support will have additional modules listed.
>
> The upcoming dkms packaging changes in the kenrel will attempt to
> building all modules listed in dkms-versions. Meaning zfs-linux will
> be enabled by default in all kernels, and kernels that target new
> consumer hardware will automtically start building
> backport-iwlwifi-dkms, once those kernels rebase onto updated debian
> packaging changes.
>
> It will also mean that for all kernels do_$module variables need not
> to be set explicitely anymore, as per-arch defaults are now correctly
> preselected on per-module basis, and correct set of modules can be
> controlled from this repository.
>
> BugLink: https://bugs.launchpad.net/bugs/1969434
>
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
> ---
> dkms-versions/impish:hwe | 3 +++
> dkms-versions/impish:main | 3 +--
> dkms-versions/jammy:hwe | 3 +++
> dkms-versions/jammy:main | 3 +--
> dkms-versions/kinetic:hwe | 3 +++
> dkms-versions/kinetic:main | 3 +--
> map/dkms-versions/focal:linux-hwe-5.15:main | 1 +
> map/dkms-versions/focal:linux-intel-iotg-5.15:main | 1 +
> map/dkms-versions/focal:linux-lowlatency-hwe-5.15:main | 1 +
> map/dkms-versions/focal:linux-oem-5.14:main | 1 +
> map/dkms-versions/jammy:linux-hwe-5.17:main | 1 +
> map/dkms-versions/jammy:linux-intel-iotg:main | 1 +
> map/dkms-versions/jammy:linux-lowlatency:main | 1 +
> map/dkms-versions/jammy:linux-oem-5.17:main | 1 +
> map/dkms-versions/jammy:linux:main | 1 +
> map/dkms-versions/kinetic:linux-intel-iotg:main | 1 +
> map/dkms-versions/kinetic:linux-lowlatency:main | 1 +
> map/dkms-versions/kinetic:linux-unstable:main | 1 +
> map/dkms-versions/kinetic:linux:main | 1 +
> 19 files changed, 25 insertions(+), 6 deletions(-)
> create mode 100644 dkms-versions/impish:hwe
> create mode 100644 dkms-versions/jammy:hwe
> create mode 100644 dkms-versions/kinetic:hwe
> create mode 100644 map/dkms-versions/focal:linux-hwe-5.15:main
> create mode 100644 map/dkms-versions/focal:linux-intel-iotg-5.15:main
> create mode 100644 map/dkms-versions/focal:linux-lowlatency-hwe-5.15:main
> create mode 100644 map/dkms-versions/focal:linux-oem-5.14:main
> create mode 100644 map/dkms-versions/jammy:linux-hwe-5.17:main
> create mode 100644 map/dkms-versions/jammy:linux-intel-iotg:main
> create mode 100644 map/dkms-versions/jammy:linux-lowlatency:main
> create mode 100644 map/dkms-versions/jammy:linux-oem-5.17:main
> create mode 100644 map/dkms-versions/jammy:linux:main
> create mode 100644 map/dkms-versions/kinetic:linux-intel-iotg:main
> create mode 100644 map/dkms-versions/kinetic:linux-lowlatency:main
> create mode 100644 map/dkms-versions/kinetic:linux-unstable:main
> create mode 100644 map/dkms-versions/kinetic:linux:main
>
> diff --git a/dkms-versions/impish:hwe b/dkms-versions/impish:hwe
> new file mode 100644
> index 0000000000..d2e0338076
> --- /dev/null
> +++ b/dkms-versions/impish:hwe
> @@ -0,0 +1,3 @@
> +backport-iwlwifi-dkms 9858-0ubuntu3 modulename=iwlwifi debpath=pool/universe/b/%package%/backport-iwlwifi-dkms_%version%_all.deb arch=amd64 rprovides=iwlwifi-modules rprovides=backport-iwlwifi-dkms type=standalone
> +v4l2loopback 0.12.5-1ubuntu3 modulename=v4l2loopback debpath=pool/universe/v/%package%/v4l2loopback-dkms_%version%_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms
> +zfs-linux 2.0.6-1ubuntu2.1 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
> diff --git a/dkms-versions/impish:main b/dkms-versions/impish:main
> index 952f827a44..3cd38904a8 100644
> --- a/dkms-versions/impish:main
> +++ b/dkms-versions/impish:main
> @@ -1,2 +1 @@
> -v4l2loopback 0.12.5-1ubuntu3
> -zfs-linux 2.0.6-1ubuntu2.1
> +zfs-linux 2.0.6-1ubuntu2.1 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
> diff --git a/dkms-versions/jammy:hwe b/dkms-versions/jammy:hwe
> new file mode 100644
> index 0000000000..1b6aa1a38b
> --- /dev/null
> +++ b/dkms-versions/jammy:hwe
> @@ -0,0 +1,3 @@
> +backport-iwlwifi-dkms 9858-0ubuntu3 modulename=iwlwifi debpath=pool/universe/b/%package%/backport-iwlwifi-dkms_%version%_all.deb arch=amd64 rprovides=iwlwifi-modules rprovides=backport-iwlwifi-dkms type=standalone
> +v4l2loopback 0.12.5-1ubuntu5 modulename=v4l2loopback debpath=pool/universe/v/%package%/v4l2loopback-dkms_%version%_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms
> +zfs-linux 2.1.2-1ubuntu3 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
> diff --git a/dkms-versions/jammy:main b/dkms-versions/jammy:main
> index 611b6cec6f..26067dabdd 100644
> --- a/dkms-versions/jammy:main
> +++ b/dkms-versions/jammy:main
> @@ -1,2 +1 @@
> -v4l2loopback 0.12.5-1ubuntu5
> -zfs-linux 2.1.2-1ubuntu3
> +zfs-linux 2.1.2-1ubuntu3 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
> diff --git a/dkms-versions/kinetic:hwe b/dkms-versions/kinetic:hwe
> new file mode 100644
> index 0000000000..543c0a015b
> --- /dev/null
> +++ b/dkms-versions/kinetic:hwe
> @@ -0,0 +1,3 @@
> +backport-iwlwifi-dkms 9858-0ubuntu4 modulename=iwlwifi debpath=pool/universe/b/%package%/backport-iwlwifi-dkms_%version%_all.deb arch=amd64 rprovides=iwlwifi-modules rprovides=backport-iwlwifi-dkms type=standalone
> +v4l2loopback 0.12.5-1ubuntu6 modulename=v4l2loopback debpath=pool/universe/v/%package%/v4l2loopback-dkms_%version%_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms
> +zfs-linux 2.1.4-0ubuntu1 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
> diff --git a/dkms-versions/kinetic:main b/dkms-versions/kinetic:main
> index 0029cd8975..a21f78b1a6 100644
> --- a/dkms-versions/kinetic:main
> +++ b/dkms-versions/kinetic:main
> @@ -1,2 +1 @@
> -v4l2loopback 0.12.5-1ubuntu6
> -zfs-linux 2.1.4-0ubuntu1
> +zfs-linux 2.1.4-0ubuntu1 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms
> diff --git a/map/dkms-versions/focal:linux-hwe-5.15:main b/map/dkms-versions/focal:linux-hwe-5.15:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/focal:linux-hwe-5.15:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/focal:linux-intel-iotg-5.15:main b/map/dkms-versions/focal:linux-intel-iotg-5.15:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/focal:linux-intel-iotg-5.15:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/focal:linux-lowlatency-hwe-5.15:main b/map/dkms-versions/focal:linux-lowlatency-hwe-5.15:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/focal:linux-lowlatency-hwe-5.15:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/focal:linux-oem-5.14:main b/map/dkms-versions/focal:linux-oem-5.14:main
> new file mode 100644
> index 0000000000..80d15d6508
> --- /dev/null
> +++ b/map/dkms-versions/focal:linux-oem-5.14:main
> @@ -0,0 +1 @@
> +dkms-versions/impish:hwe
> diff --git a/map/dkms-versions/jammy:linux-hwe-5.17:main b/map/dkms-versions/jammy:linux-hwe-5.17:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/jammy:linux-hwe-5.17:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/jammy:linux-intel-iotg:main b/map/dkms-versions/jammy:linux-intel-iotg:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/jammy:linux-intel-iotg:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/jammy:linux-lowlatency:main b/map/dkms-versions/jammy:linux-lowlatency:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/jammy:linux-lowlatency:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/jammy:linux-oem-5.17:main b/map/dkms-versions/jammy:linux-oem-5.17:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/jammy:linux-oem-5.17:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/jammy:linux:main b/map/dkms-versions/jammy:linux:main
> new file mode 100644
> index 0000000000..1998a11853
> --- /dev/null
> +++ b/map/dkms-versions/jammy:linux:main
> @@ -0,0 +1 @@
> +dkms-versions/jammy:hwe
> diff --git a/map/dkms-versions/kinetic:linux-intel-iotg:main b/map/dkms-versions/kinetic:linux-intel-iotg:main
> new file mode 100644
> index 0000000000..6f56b93aa2
> --- /dev/null
> +++ b/map/dkms-versions/kinetic:linux-intel-iotg:main
> @@ -0,0 +1 @@
> +dkms-versions/kinetic:hwe
> diff --git a/map/dkms-versions/kinetic:linux-lowlatency:main b/map/dkms-versions/kinetic:linux-lowlatency:main
> new file mode 100644
> index 0000000000..6f56b93aa2
> --- /dev/null
> +++ b/map/dkms-versions/kinetic:linux-lowlatency:main
> @@ -0,0 +1 @@
> +dkms-versions/kinetic:hwe
> diff --git a/map/dkms-versions/kinetic:linux-unstable:main b/map/dkms-versions/kinetic:linux-unstable:main
> new file mode 100644
> index 0000000000..6f56b93aa2
> --- /dev/null
> +++ b/map/dkms-versions/kinetic:linux-unstable:main
> @@ -0,0 +1 @@
> +dkms-versions/kinetic:hwe
> diff --git a/map/dkms-versions/kinetic:linux:main b/map/dkms-versions/kinetic:linux:main
> new file mode 100644
> index 0000000000..6f56b93aa2
> --- /dev/null
> +++ b/map/dkms-versions/kinetic:linux:main
> @@ -0,0 +1 @@
> +dkms-versions/kinetic:hwe
> --
> 2.32.0
>
More information about the kernel-team
mailing list