diff --git a/kernel-modules/intel-i40e/debian/deb_folder/changelog b/kernel-modules/intel-i40e/debian/deb_folder/changelog index 78077e44..d5fd84af 100644 --- a/kernel-modules/intel-i40e/debian/deb_folder/changelog +++ b/kernel-modules/intel-i40e/debian/deb_folder/changelog @@ -1,3 +1,10 @@ +i40e (2.20.12-1) unstable; urgency=medium + + * Update iavf driver to 4.5.3, and that dictates the upgrade of the i40e + driver. We select the version 2.20.12-1 that comes from bundle 27.5. + + -- Jiping Ma Thu, 01 Sep 2022 15:29:23 +0800 + i40e (2.18.9-1) unstable; urgency=medium * Update iavf driver to 4.4.2, and that dictates the upgrade of the i40e diff --git a/kernel-modules/intel-i40e/debian/meta_data.yaml b/kernel-modules/intel-i40e/debian/meta_data.yaml index f3d8feee..c89f385a 100644 --- a/kernel-modules/intel-i40e/debian/meta_data.yaml +++ b/kernel-modules/intel-i40e/debian/meta_data.yaml @@ -1,12 +1,12 @@ --- -debver: 2.18.9 +debver: 2.20.12 debname: i40e dl_path: - name: i40e-2.18.9.tar.gz + name: i40e-2.20.12.tar.gz url: "https://sourceforge.net/projects/e1000/files/i40e%20stable/\ - 2.18.9/i40e-2.18.9.tar.gz/download" - md5sum: f8caf2c9123d83b538812927c1460450 - sha256sum: 68184b31fd1f1c7b61ce42c0c5bff25d14bc08d95676b84ec115ba893776d720 + 2.20.12/i40e-2.20.12.tar.gz/download" + md5sum: 05fe1a7b28d47fefaff9ec20600c19c0 + sha256sum: 11419e81b85946575338ab2b78260a647dc458753d6c10de68dc8a199425b8ec 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 80a32167..4891c663 100644 --- a/kernel-modules/intel-iavf/debian/deb_folder/changelog +++ b/kernel-modules/intel-iavf/debian/deb_folder/changelog @@ -1,3 +1,8 @@ +iavf (4.5.3-1) unstable; urgency=medium + + * Update ICE driver to 1.9.11, and that dictates the upgrade of the iavf + driver. We select the version 4.5.3-1 that comes from bundle 27.5. + iavf (4.4.2-1) unstable; urgency=medium * Update ICE driver to 1.8.3, and that dictates the upgrade of the iavf diff --git a/kernel-modules/intel-iavf/debian/deb_folder/patches/0001-intel-iavf-pass-linux-common-header-to-check_aux_bus.patch b/kernel-modules/intel-iavf/debian/deb_folder/patches/0001-intel-iavf-pass-linux-common-header-to-check_aux_bus.patch index 56871238..3b30bcbc 100644 --- a/kernel-modules/intel-iavf/debian/deb_folder/patches/0001-intel-iavf-pass-linux-common-header-to-check_aux_bus.patch +++ b/kernel-modules/intel-iavf/debian/deb_folder/patches/0001-intel-iavf-pass-linux-common-header-to-check_aux_bus.patch @@ -1,4 +1,4 @@ -From f5c58571e3f4278082e87bdbb2be565d61c0a21c Mon Sep 17 00:00:00 2001 +From 9c8a4be36cf93039931c01970943420b787d37bc Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Thu, 7 Apr 2022 11:42:47 +0800 Subject: [PATCH] intel-iavf: pass linux common header to check_aux_bus @@ -11,15 +11,17 @@ path as the KSRC for check_aux_bus when KSRC_COMMON is exported in debian rules. Signed-off-by: Li Zhou +[jpm: Refresh patch for iavf v4.5.3)] +Signed-off-by: Jiping Ma --- src/common.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common.mk b/src/common.mk -index e164d13..b2b4fe2 100644 +index 0b2ad05..a0b65d6 100644 --- a/src/common.mk +++ b/src/common.mk -@@ -373,8 +373,13 @@ export INSTALL_MOD_DIR ?= updates/drivers/net/ethernet/intel/${DRIVER} +@@ -410,9 +410,14 @@ export INSTALL_MOD_DIR ?= updates/drivers/net/ethernet/intel/${DRIVER} # If the check_aux_bus script exists, then this driver depends on the # auxiliary module. Run the script to determine if we need to include # auxiliary files with this build. @@ -28,12 +30,13 @@ index e164d13..b2b4fe2 100644 +else +KSRC_AUX := ${KSRC_COMMON} +endif - ifneq ($(call test_file,../scripts/check_aux_bus),) --NEED_AUX_BUS := $(shell ../scripts/check_aux_bus --ksrc="${KSRC}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) -+NEED_AUX_BUS := $(shell ../scripts/check_aux_bus --ksrc="${KSRC_AUX}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) + CHECK_AUX_BUS ?= ../scripts/check_aux_bus + ifneq ($(call test_file,${CHECK_AUX_BUS}),) +-NEED_AUX_BUS := $(shell ${CHECK_AUX_BUS} --ksrc="${KSRC}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) ++NEED_AUX_BUS := $(shell ${CHECK_AUX_BUS} --ksrc="${KSRC_AUX}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) endif # check_aux_bus exists # The out-of-tree auxiliary module we ship should be moved into this -- -2.17.1 +2.30.2 diff --git a/kernel-modules/intel-iavf/debian/meta_data.yaml b/kernel-modules/intel-iavf/debian/meta_data.yaml index 2a96eca0..c7cc67ff 100644 --- a/kernel-modules/intel-iavf/debian/meta_data.yaml +++ b/kernel-modules/intel-iavf/debian/meta_data.yaml @@ -1,12 +1,12 @@ --- -debver: 4.4.2 +debver: 4.5.3 debname: iavf dl_path: - name: iavf-4.4.2.tar.gz + name: iavf-4.5.3.tar.gz url: "https://sourceforge.net/projects/e1000/files/iavf%20stable/\ - 4.4.2/iavf-4.4.2.tar.gz/download" - md5sum: 131fea2266c82ffd6bcfaac0a0568e90 - sha256sum: 9db3dd700b3fd770ff207968a9e230fd45f1b36d6ae61ebf2f468f4822a48a96 + 4.5.3/iavf-4.5.3.tar.gz/download" + md5sum: 4c9d3d3f471374501b16ef7316e316c6 + sha256sum: 48e6b4efeb33e3ee256adcd262c6ce460cf3f43d1a87590836f504c05af9f1c2 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 9f7713d4..e68dfac1 100644 --- a/kernel-modules/intel-ice/debian/deb_folder/changelog +++ b/kernel-modules/intel-ice/debian/deb_folder/changelog @@ -1,3 +1,10 @@ +ice (1.9.11-1) unstable; urgency=medium + + * Update ICE driver to 1.9.11 to support the Intel Logan Beach NIC + (E810-CQDA2T), which comes from bundle 27.5. + + -- Jiping Ma Thu, 01 Sep 2022 11:32:03 +0800 + ice (1.8.3-1) unstable; urgency=medium * Update ICE driver to 1.8.3-1 to support the Intel Logan Beach NIC diff --git a/kernel-modules/intel-ice/debian/deb_folder/patches/0001-intel-ice-pass-linux-common-header-to-check_aux_bus.patch b/kernel-modules/intel-ice/debian/deb_folder/patches/0001-intel-ice-pass-linux-common-header-to-check_aux_bus.patch index 768b1f06..24055bf1 100644 --- a/kernel-modules/intel-ice/debian/deb_folder/patches/0001-intel-ice-pass-linux-common-header-to-check_aux_bus.patch +++ b/kernel-modules/intel-ice/debian/deb_folder/patches/0001-intel-ice-pass-linux-common-header-to-check_aux_bus.patch @@ -1,4 +1,4 @@ -From 3e23e587e91eaa7425dd0f24e9edc783182a485a Mon Sep 17 00:00:00 2001 +From 06d6ff36d428a013913013237eb3257aa68cd668 Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Thu, 7 Apr 2022 11:42:47 +0800 Subject: [PATCH] intel-ice: pass linux common header to check_aux_bus @@ -11,15 +11,17 @@ path as the KSRC for check_aux_bus when KSRC_COMMON is exported in debian rules. Signed-off-by: Li Zhou +[jpm: Refresh patch for ice v1.9.11)] +Signed-off-by: Jiping Ma --- src/common.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common.mk b/src/common.mk -index 80f30ab..8cf8bab 100644 +index 960c15e..2ecff1b 100644 --- a/src/common.mk +++ b/src/common.mk -@@ -372,8 +372,13 @@ export INSTALL_MOD_DIR ?= updates/drivers/net/ethernet/intel/${DRIVER} +@@ -410,9 +410,14 @@ export INSTALL_MOD_DIR ?= updates/drivers/net/ethernet/intel/${DRIVER} # If the check_aux_bus script exists, then this driver depends on the # auxiliary module. Run the script to determine if we need to include # auxiliary files with this build. @@ -28,12 +30,13 @@ index 80f30ab..8cf8bab 100644 +else +KSRC_AUX := ${KSRC_COMMON} +endif - ifneq ($(call test_file,../scripts/check_aux_bus),) --NEED_AUX_BUS := $(shell ../scripts/check_aux_bus --ksrc="${KSRC}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) -+NEED_AUX_BUS := $(shell ../scripts/check_aux_bus --ksrc="${KSRC_AUX}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) + CHECK_AUX_BUS ?= ../scripts/check_aux_bus + ifneq ($(call test_file,${CHECK_AUX_BUS}),) +-NEED_AUX_BUS := $(shell ${CHECK_AUX_BUS} --ksrc="${KSRC}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) ++NEED_AUX_BUS := $(shell ${CHECK_AUX_BUS} --ksrc="${KSRC_AUX}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?) endif # check_aux_bus exists # The out-of-tree auxiliary module we ship should be moved into this -- -2.17.1 +2.30.2 diff --git a/kernel-modules/intel-ice/debian/deb_folder/rules b/kernel-modules/intel-ice/debian/deb_folder/rules index 5b6a6bd7..ba46836c 100755 --- a/kernel-modules/intel-ice/debian/deb_folder/rules +++ b/kernel-modules/intel-ice/debian/deb_folder/rules @@ -73,5 +73,6 @@ ifeq ($(WITH_MOD_SIGN),1) endif override_dh_auto_build: - unzip -d ice_comms ice_comms*.zip + unzip -d ddp_comms 800-Series-DDP-Comms-Package-*.zip + unzip -d ice_comms ddp_comms/ice_comms*.zip dh_auto_build -D ./src diff --git a/kernel-modules/intel-ice/debian/meta_data.yaml b/kernel-modules/intel-ice/debian/meta_data.yaml index e801f2c1..b2699e10 100644 --- a/kernel-modules/intel-ice/debian/meta_data.yaml +++ b/kernel-modules/intel-ice/debian/meta_data.yaml @@ -1,19 +1,19 @@ --- -debver: 1.8.3 +debver: 1.9.11 debname: ice dl_path: - name: ice-1.8.3.tar.gz + name: ice-1.9.11.tar.gz url: "https://sourceforge.net/projects/e1000/files/ice%20stable/\ - 1.8.3/ice-1.8.3.tar.gz" - md5sum: 9f14e96c6c807a5e1a57fb9075c85662 - sha256sum: 180eaec1a644c1803d85df121575878e9291d583f926dec1ca7f1f4798f7e54c + 1.9.11/ice-1.9.11.tar.gz" + md5sum: 26916c6a807a8ad7b977071d31c9ae01 + sha256sum: 1c7640e81ba489321c6b29024517851f927291eb2e1c5c292ef5a74a6462f064 dl_files: - ice_comms-1.3.35.0.zip: + 800-Series-DDP-Comms-Package-1.3.37.0.zip: topdir: null - url: "https://downloadmirror.intel.com/727568/\ - ice_comms-1.3.35.0.zip" - md5sum: ee79feecf555fa50d26dfc7c07879e41 - sha256sum: 4bd0cc87784747f799e4600a54ec3710f006a89a0268efa201f30cb34a731908 + url: "https://downloadmirror.intel.com/738733/\ + 800%20Series%20DDP%20Comms%20Package%201.3.37.0.zip" + md5sum: ba5febc828e1789d6c81bae5f1ab5d71 + sha256sum: ee048ea47cd9d1f33b628131e8adc3751cc850bf89040cb8ebaa845d1a85508e revision: dist: $STX_DIST PKG_GITREVCOUNT: true