From patchwork Fri May 13 14:42:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1630771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=rNL4dqB/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0BFg0Nfsz9sFk for ; Sat, 14 May 2022 00:42:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1npWV5-0007Qb-5W; Fri, 13 May 2022 14:42:39 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1npWV3-0007QP-6q for kernel-team@lists.ubuntu.com; Fri, 13 May 2022 14:42:37 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 970F23F1B3 for ; Fri, 13 May 2022 14:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652452956; bh=VT8yZoqBVdSmzwFpbfz0LdRupxntBA8029fx8FM74YI=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=rNL4dqB/QQUFfdX31hA09QFe3eNJEtyT3051MnJXTtHkpAmVlMsiYmuz3bpPS+p9t btnt1wl/LOB3qpcLvAz2uBS+WMTNLACxdiVQUcUiM+jieCdYkIfd2qFZ6tQ+irlgMM vl/9XcTiOk+fPUWnxLVTNDBxXb5bBzy4FLAKW4mTwhK51C0tra/zT3muv4HK6d/TKu C30EdyOtiRpcSQWpnL5KtjGVzwXW2/KgEup9+wyMxxG3y/SKYfVWs6tW3OWVLqv1Nf hAMD65Rv1llkGHZFXLAQMgLMRX6eD3xVRtZSksRR3mEmlRmuOTtPG1yBWwgoGWWdx1 x4K2T2prljgVg== Received: by mail-wr1-f72.google.com with SMTP id p10-20020adfaa0a000000b0020c4829af5fso3000503wrd.16 for ; Fri, 13 May 2022 07:42:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VT8yZoqBVdSmzwFpbfz0LdRupxntBA8029fx8FM74YI=; b=bz9KypFeyF971Gfg7pxV9cwS2KsYgJWYJi7cqBIbudVJOSiJlqoC0IhiVlpEFaRDVM AA3GuQbP7RETfIkU+vEYfq8WZjZJz7lJWWFlpd0It+lRHNpyIECk6hFO94qAtatXwO2f 7TbrRiyv8fnWDRODvRP4umBOBpC+5ilCVGCbkkhK1FTVYcbIMTHQI252iiW2wdWy+kzK Trqkcg0Khe7gsn7x0qvnfEM+Xig1kHLzCwULqHV588zR/MDpI3gkS6j4KhPDl+jcVU9Y Q8WP+76uLmxyrSC5cEXRL4aUEeazRPCBbbHVmF+cZBuUZ+CLygI3gJ2OvgDvd0NJwJQv 8Rig== X-Gm-Message-State: AOAM531cSDJzK6z0xJs8vN63Viy/6MndRJAZlFqYrMpej4QEp0xJDS6g 9zDmimgP3CSOjAm+0AgArr1soXkvED5ExlK2ce308DTUio1Ph71xo0mRf8uywT6QMIbiWZ7i8cf VU2u/TX2MRRuMPP36h5Mt9Sjzoa0H0Dv64GQtlMMBBA== X-Received: by 2002:a05:600c:3549:b0:394:89ba:e1be with SMTP id i9-20020a05600c354900b0039489bae1bemr4857099wmq.181.1652452955853; Fri, 13 May 2022 07:42:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBKf0FauzFDoYLyxoqTV8+hfN3rLVg+E7wSxK5Z1UE1Gl+IEVOgNSnd4B7EEYLSWuibgfUtg== X-Received: by 2002:a05:600c:3549:b0:394:89ba:e1be with SMTP id i9-20020a05600c354900b0039489bae1bemr4857086wmq.181.1652452955415; Fri, 13 May 2022 07:42:35 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:a294:d277:e934:ddec]) by smtp.gmail.com with ESMTPSA id z23-20020a1c4c17000000b0039456fb80b3sm5405486wmf.43.2022.05.13.07.42.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 May 2022 07:42:34 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [kernel-versions][PATCH] Split hwe modules into :hwe mappings in backwards and forwards compatible way Date: Fri, 13 May 2022 15:42:30 +0100 Message-Id: <20220513144230.243797-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" * 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 --- 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