From 1927a6d6250856164295aa1aca2ba0e40fa95c18 Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Thu, 24 Feb 2022 18:34:39 +0000 Subject: [PATCH] debian: Upgrade ice, i40e, iavf to bundle 26.8 This debianizes commit 40dd7abe86eb4f3ca827da4c44fba51920775a26 which upgrades the intel driver versions to the ones listed in Intel driver bundle 26.8 . The list can be found here: https://downloadmirror.intel.com/709681/Release_Notes_26.8_v1.1.pdf The new versions are: ice-1.7.16 i40e-2.17.4 iavf-4.3.19 Of note is that the iavf driver builds and links against the auxiliary bus driver, but does not package it. At runtime it uses the one packaged in the ice driver which is the same version. Beware of this dependency if upgrading either driver. This behaviour is the same as in CentOS. At this time, a backport of the auxiliary bus driver to kernel 5.10 is being investigated as the Mellanox driver also has need to use it, and managing version dependencies is quickly going to be an issue if it is not built into the kernel. Verification: - ice, i40e, iavf packages all build ok - examine the internals of the resulting .deb packages to ensure expected .ko files are there - run build-image and verify that an iso is successfully generated Story: 2009130 Task: 44608 Change-Id: I0ad22762b1de316d5ae4631f05db9569bff037d1 Signed-off-by: Jim Somerville --- .../intel-i40e/debian/deb_folder/changelog | 6 ++++ .../intel-i40e/debian/deb_folder/copyright | 4 +-- .../intel-i40e/debian/meta_data.yaml | 8 ++--- .../intel-iavf/debian/deb_folder/changelog | 6 ++++ .../intel-iavf/debian/deb_folder/copyright | 4 +-- ...ok-for-kernel-headers-in-the-right-l.patch | 29 +++++++++++++++++++ .../debian/deb_folder/patches/series | 1 + .../intel-iavf/debian/meta_data.yaml | 8 ++--- .../intel-ice/debian/deb_folder/changelog | 6 ++++ .../intel-ice/debian/deb_folder/copyright | 4 +-- ...ok-for-kernel-headers-in-the-right-l.patch | 29 +++++++++++++++++++ .../debian/deb_folder/patches/series | 1 + .../intel-ice/debian/deb_folder/rules | 1 + .../intel-ice/debian/meta_data.yaml | 8 ++--- 14 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 kernel-modules/intel-iavf/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch create mode 100644 kernel-modules/intel-iavf/debian/deb_folder/patches/series create mode 100644 kernel-modules/intel-ice/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch diff --git a/kernel-modules/intel-i40e/debian/deb_folder/changelog b/kernel-modules/intel-i40e/debian/deb_folder/changelog index 333d0aaf..71f574bc 100644 --- a/kernel-modules/intel-i40e/debian/deb_folder/changelog +++ b/kernel-modules/intel-i40e/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +i40e (2.17.4-1) unstable; urgency=medium + + * Initial release + + -- Jim Somerville Fri, 25 Feb 2022 15:52:40 -0500 + i40e (2.16.11-1) unstable; urgency=medium * Initial release diff --git a/kernel-modules/intel-i40e/debian/deb_folder/copyright b/kernel-modules/intel-i40e/debian/deb_folder/copyright index 8dcc2f50..041da905 100644 --- a/kernel-modules/intel-i40e/debian/deb_folder/copyright +++ b/kernel-modules/intel-i40e/debian/deb_folder/copyright @@ -2,9 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: i40e Upstream-Contact: Intel Corporation -Source: https://sourceforge.net/projects/e1000/files/i40e%20stable/2.16.11/i40e-2.16.11.tar.gz/download +Source: https://sourceforge.net/projects/e1000/files/i40e%20stable/2.17.4/i40e-2.17.4.tar.gz/download Files: * -Copyright: (c) 2014 - 2021 Intel Corporation. +Copyright: (c) 2014 - 2022 Intel Corporation. License: GPL-2 This program is free software; you can redistribute it and/or modify it under diff --git a/kernel-modules/intel-i40e/debian/meta_data.yaml b/kernel-modules/intel-i40e/debian/meta_data.yaml index 5ac14e87..0c0dd7f3 100644 --- a/kernel-modules/intel-i40e/debian/meta_data.yaml +++ b/kernel-modules/intel-i40e/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- -debver: 2.16.11 +debver: 2.17.4 debname: i40e dl_path: - name: i40e-2.16.11.tar.gz + name: i40e-2.17.4.tar.gz url: "https://sourceforge.net/projects/e1000/files/i40e%20stable/\ - 2.16.11/i40e-2.16.11.tar.gz/download" - md5sum: 60cdb7d87d448a4d4259528d09d7636a + 2.17.4/i40e-2.17.4.tar.gz/download" + md5sum: 25101f2fa1fdb7264b5e7add8ff70917 revision: dist: $STX_DIST PKG_GITREVCOUNT: true diff --git a/kernel-modules/intel-iavf/debian/deb_folder/changelog b/kernel-modules/intel-iavf/debian/deb_folder/changelog index e9b574d9..d3b1697e 100644 --- a/kernel-modules/intel-iavf/debian/deb_folder/changelog +++ b/kernel-modules/intel-iavf/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +iavf (4.3.19-1) unstable; urgency=medium + + * Initial release + + -- Jim Somerville Fri, 25 Feb 2022 15:58:48 -0500 + iavf (4.2.7-1) unstable; urgency=medium * Initial release diff --git a/kernel-modules/intel-iavf/debian/deb_folder/copyright b/kernel-modules/intel-iavf/debian/deb_folder/copyright index 80580adc..bac0ed7b 100644 --- a/kernel-modules/intel-iavf/debian/deb_folder/copyright +++ b/kernel-modules/intel-iavf/debian/deb_folder/copyright @@ -2,9 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: iavf Upstream-Contact: Intel Corporation -Source: https://sourceforge.net/projects/e1000/files/iavf%20stable/4.2.7/iavf-4.2.7.tar.gz/download +Source: https://sourceforge.net/projects/e1000/files/iavf%20stable/4.3.19/iavf-4.3.19.tar.gz/download Files: * -Copyright: (c) 2018 - 2021 Intel Corporation. +Copyright: (c) 2018 - 2022 Intel Corporation. License: GPL-2 This program is free software; you can redistribute it and/or modify it under diff --git a/kernel-modules/intel-iavf/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch b/kernel-modules/intel-iavf/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch new file mode 100644 index 00000000..3ace5cfc --- /dev/null +++ b/kernel-modules/intel-iavf/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch @@ -0,0 +1,29 @@ +From ed1fd30875a61bc36fd0d652cd04d532551ad4a1 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jim Somerville +Date: Tue, 22 Feb 2022 17:41:51 -0500 +Subject: [PATCH] check_aux_bus: Look for kernel headers in the right location + +Debian puts them under include/config + +Signed-off-by: Jim Somerville +--- + scripts/check_aux_bus | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/check_aux_bus b/scripts/check_aux_bus +index f3e1b54..14494e4 100755 +--- a/scripts/check_aux_bus ++++ b/scripts/check_aux_bus +@@ -62,7 +62,7 @@ find_aux_bus_inc() + msg "auxiliary_bus.h location: ${aux_bus_inc}" + } + +-LINUX_INCLUDE_DIR="include/linux" ++LINUX_INCLUDE_DIR="include/config" + + set_build_kernel() + { +-- +2.29.2 + diff --git a/kernel-modules/intel-iavf/debian/deb_folder/patches/series b/kernel-modules/intel-iavf/debian/deb_folder/patches/series new file mode 100644 index 00000000..fd6ea026 --- /dev/null +++ b/kernel-modules/intel-iavf/debian/deb_folder/patches/series @@ -0,0 +1 @@ +0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch diff --git a/kernel-modules/intel-iavf/debian/meta_data.yaml b/kernel-modules/intel-iavf/debian/meta_data.yaml index cfdaa67a..dd85ee9b 100644 --- a/kernel-modules/intel-iavf/debian/meta_data.yaml +++ b/kernel-modules/intel-iavf/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- -debver: 4.2.7 +debver: 4.3.19 debname: iavf dl_path: - name: iavf-4.2.7.tar.gz + name: iavf-4.3.19.tar.gz url: "https://sourceforge.net/projects/e1000/files/iavf%20stable/\ - 4.2.7/iavf-4.2.7.tar.gz/download" - md5sum: 95052de96ae2084922ef681e30f18e22 + 4.3.19/iavf-4.3.19.tar.gz/download" + md5sum: c1c47a0183a56a6f0ae05791df6cfc82 revision: dist: $STX_DIST PKG_GITREVCOUNT: true diff --git a/kernel-modules/intel-ice/debian/deb_folder/changelog b/kernel-modules/intel-ice/debian/deb_folder/changelog index 34edd4e5..f4907c82 100644 --- a/kernel-modules/intel-ice/debian/deb_folder/changelog +++ b/kernel-modules/intel-ice/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +ice (1.7.16-1) unstable; urgency=medium + + * Initial release + + -- Jim Somerville Fri, 25 Feb 2022 16:01:39 -0500 + ice (1.6.7-1) unstable; urgency=medium * Initial release diff --git a/kernel-modules/intel-ice/debian/deb_folder/copyright b/kernel-modules/intel-ice/debian/deb_folder/copyright index 1258453e..3bb59249 100644 --- a/kernel-modules/intel-ice/debian/deb_folder/copyright +++ b/kernel-modules/intel-ice/debian/deb_folder/copyright @@ -2,9 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ice Upstream-Contact: Intel Corporation -Source: https://sourceforge.net/projects/e1000/files/ice%20stable/1.6.7/ice-1.6.7.tar.gz/download +Source: https://sourceforge.net/projects/e1000/files/ice%20stable/1.7.16/ice-1.7.16.tar.gz/download Files: * -Copyright: (c) 2017 - 2021 Intel Corporation. +Copyright: (c) 2017 - 2022 Intel Corporation. License: GPL-2 This program is free software; you can redistribute it and/or modify it under diff --git a/kernel-modules/intel-ice/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch b/kernel-modules/intel-ice/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch new file mode 100644 index 00000000..3ace5cfc --- /dev/null +++ b/kernel-modules/intel-ice/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch @@ -0,0 +1,29 @@ +From ed1fd30875a61bc36fd0d652cd04d532551ad4a1 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Jim Somerville +Date: Tue, 22 Feb 2022 17:41:51 -0500 +Subject: [PATCH] check_aux_bus: Look for kernel headers in the right location + +Debian puts them under include/config + +Signed-off-by: Jim Somerville +--- + scripts/check_aux_bus | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/check_aux_bus b/scripts/check_aux_bus +index f3e1b54..14494e4 100755 +--- a/scripts/check_aux_bus ++++ b/scripts/check_aux_bus +@@ -62,7 +62,7 @@ find_aux_bus_inc() + msg "auxiliary_bus.h location: ${aux_bus_inc}" + } + +-LINUX_INCLUDE_DIR="include/linux" ++LINUX_INCLUDE_DIR="include/config" + + set_build_kernel() + { +-- +2.29.2 + diff --git a/kernel-modules/intel-ice/debian/deb_folder/patches/series b/kernel-modules/intel-ice/debian/deb_folder/patches/series index 35c6329c..2d3856de 100644 --- a/kernel-modules/intel-ice/debian/deb_folder/patches/series +++ b/kernel-modules/intel-ice/debian/deb_folder/patches/series @@ -1 +1,2 @@ 0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch +0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch diff --git a/kernel-modules/intel-ice/debian/deb_folder/rules b/kernel-modules/intel-ice/debian/deb_folder/rules index 9db34954..ff2b14cd 100755 --- a/kernel-modules/intel-ice/debian/deb_folder/rules +++ b/kernel-modules/intel-ice/debian/deb_folder/rules @@ -44,6 +44,7 @@ endif override_dh_auto_install: dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)/ + dh_install src/auxiliary.ko /lib/modules/$(kversion)/extra/$(kmod_name)/ dh_install pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install $(kmod_name).7 $(_mandir)/man7/ diff --git a/kernel-modules/intel-ice/debian/meta_data.yaml b/kernel-modules/intel-ice/debian/meta_data.yaml index cc8771b3..6ab18a4f 100644 --- a/kernel-modules/intel-ice/debian/meta_data.yaml +++ b/kernel-modules/intel-ice/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- -debver: 1.6.7 +debver: 1.7.16 debname: ice dl_path: - name: ice-1.6.7.tar.gz + name: ice-1.7.16.tar.gz url: "https://sourceforge.net/projects/e1000/files/ice%20stable/\ - 1.6.7/ice-1.6.7.tar.gz" - md5sum: 37d46b3cc4c9bef7bd80f2fc36879905 + 1.7.16/ice-1.7.16.tar.gz" + md5sum: ee6880350a799f0337914c33f1b5c8c0 revision: dist: $STX_DIST PKG_GITREVCOUNT: true