starlingx/kernel
Code Issues Proposed changes

debian: Upgrade ice, i40e, iavf to bundle 26.8

Browse Source 
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 <jim.somerville@windriver.com>
This commit is contained in:
Jim Somerville 2022-02-24 18:34:39 +00:00 committed by Jim Somerville
parent 7ded004316
commit 1927a6d625
14 changed files with 97 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-modules/intel-i40e/debian/deb_folder/changelog
View File

@ -1,3 +1,9 @@
i40e (2.17.4-1) unstable; urgency=medium
* Initial release
-- Jim Somerville <jim.somerville@windriver.com> Fri, 25 Feb 2022 15:52:40 -0500
i40e (2.16.11-1) unstable; urgency=medium i40e (2.16.11-1) unstable; urgency=medium
* Initial release * Initial release

4
kernel-modules/intel-i40e/debian/deb_folder/copyright
View File

@ -2,9 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: i40e Upstream-Name: i40e
Upstream-Contact: Intel Corporation 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: * Files: *
Copyright: (c) 2014 - 2021 Intel Corporation. Copyright: (c) 2014 - 2022 Intel Corporation.
License: GPL-2 License: GPL-2
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under

8
kernel-modules/intel-i40e/debian/meta_data.yaml
View File

@ -1,11 +1,11 @@
--- ---
debver: 2.16.11 debver: 2.17.4
debname: i40e debname: i40e
dl_path: 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/\ url: "https://sourceforge.net/projects/e1000/files/i40e%20stable/\
2.16.11/i40e-2.16.11.tar.gz/download" 2.17.4/i40e-2.17.4.tar.gz/download"
md5sum: 60cdb7d87d448a4d4259528d09d7636a md5sum: 25101f2fa1fdb7264b5e7add8ff70917
revision: revision:
dist: $STX_DIST dist: $STX_DIST
PKG_GITREVCOUNT: true PKG_GITREVCOUNT: true

6
kernel-modules/intel-iavf/debian/deb_folder/changelog
View File

@ -1,3 +1,9 @@
iavf (4.3.19-1) unstable; urgency=medium
* Initial release
-- Jim Somerville <jim.somerville@windriver.com> Fri, 25 Feb 2022 15:58:48 -0500
iavf (4.2.7-1) unstable; urgency=medium iavf (4.2.7-1) unstable; urgency=medium
* Initial release * Initial release

4
kernel-modules/intel-iavf/debian/deb_folder/copyright
View File

@ -2,9 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: iavf Upstream-Name: iavf
Upstream-Contact: Intel Corporation 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: * Files: *
Copyright: (c) 2018 - 2021 Intel Corporation. Copyright: (c) 2018 - 2022 Intel Corporation.
License: GPL-2 License: GPL-2
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under

29
kernel-modules/intel-iavf/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch Normal file
View File

@ -0,0 +1,29 @@
From ed1fd30875a61bc36fd0d652cd04d532551ad4a1 Mon Sep 17 00:00:00 2001
Message-Id: <ed1fd30875a61bc36fd0d652cd04d532551ad4a1.1645648932.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
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 <Jim.Somerville@windriver.com>
---
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

1
kernel-modules/intel-iavf/debian/deb_folder/patches/series Normal file
View File

@ -0,0 +1 @@
0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch

8
kernel-modules/intel-iavf/debian/meta_data.yaml
View File

@ -1,11 +1,11 @@
--- ---
debver: 4.2.7 debver: 4.3.19
debname: iavf debname: iavf
dl_path: 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/\ url: "https://sourceforge.net/projects/e1000/files/iavf%20stable/\
4.2.7/iavf-4.2.7.tar.gz/download" 4.3.19/iavf-4.3.19.tar.gz/download"
md5sum: 95052de96ae2084922ef681e30f18e22 md5sum: c1c47a0183a56a6f0ae05791df6cfc82
revision: revision:
dist: $STX_DIST dist: $STX_DIST
PKG_GITREVCOUNT: true PKG_GITREVCOUNT: true

6
kernel-modules/intel-ice/debian/deb_folder/changelog
View File

@ -1,3 +1,9 @@
ice (1.7.16-1) unstable; urgency=medium
* Initial release
-- Jim Somerville <jim.somerville@windriver.com> Fri, 25 Feb 2022 16:01:39 -0500
ice (1.6.7-1) unstable; urgency=medium ice (1.6.7-1) unstable; urgency=medium
* Initial release * Initial release

4
kernel-modules/intel-ice/debian/deb_folder/copyright
View File

@ -2,9 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ice Upstream-Name: ice
Upstream-Contact: Intel Corporation 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: * Files: *
Copyright: (c) 2017 - 2021 Intel Corporation. Copyright: (c) 2017 - 2022 Intel Corporation.
License: GPL-2 License: GPL-2
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under

29
kernel-modules/intel-ice/debian/deb_folder/patches/0001-check_aux_bus-Look-for-kernel-headers-in-the-right-l.patch Normal file
View File

@ -0,0 +1,29 @@
From ed1fd30875a61bc36fd0d652cd04d532551ad4a1 Mon Sep 17 00:00:00 2001
Message-Id: <ed1fd30875a61bc36fd0d652cd04d532551ad4a1.1645648932.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
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 <Jim.Somerville@windriver.com>
---
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

1
kernel-modules/intel-ice/debian/deb_folder/patches/series
View File

@ -1 +1,2 @@
0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch 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

1
kernel-modules/intel-ice/debian/deb_folder/rules
View File

@ -44,6 +44,7 @@ endif
override_dh_auto_install: override_dh_auto_install:
dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)/ 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 pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/
dh_install README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/
dh_install $(kmod_name).7 $(_mandir)/man7/ dh_install $(kmod_name).7 $(_mandir)/man7/

8
kernel-modules/intel-ice/debian/meta_data.yaml
View File

@ -1,11 +1,11 @@
--- ---
debver: 1.6.7 debver: 1.7.16
debname: ice debname: ice
dl_path: 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/\ url: "https://sourceforge.net/projects/e1000/files/ice%20stable/\
1.6.7/ice-1.6.7.tar.gz" 1.7.16/ice-1.7.16.tar.gz"
md5sum: 37d46b3cc4c9bef7bd80f2fc36879905 md5sum: ee6880350a799f0337914c33f1b5c8c0
revision: revision:
dist: $STX_DIST dist: $STX_DIST
PKG_GITREVCOUNT: true PKG_GITREVCOUNT: true