From db0c0bcfec3c316e36737ed5a9cd0a01954c1012 Mon Sep 17 00:00:00 2001 From: Jiping Ma Date: Wed, 2 Nov 2022 00:05:19 -0700 Subject: [PATCH] Make driver package release a command line param Instead of hard-coding driver versions in the initramfs init script, this commit makes the driver package release (e.g., "cvl-2.54") a kernel command line parameter. As an example, if a driver package release is specified with the command line argument multi-drivers-switch=, then the initramfs init script will look for the drivers in "/lib/modules/$(uname -r)/{ice,iavf,i40e}-/". This way, the initramfs will not need further modifications for new/different driver package releases that are integrated into StarlingX in the future. It also changes the legacy driver deb package names from ice-1.5.8.1-legacy iavf-4.0.1-legacy i40e-2.14.13-legacy to ice-cvl-2.54 iavf-cvl-2.54 i40e-cvl-2.54 Legacy drivers location folder: ls /lib/modules/$(uname -r)/extra/ i40e-cvl-2.54 iavf-cvl-2.54 ice-cvl-2.54 Latest driverslocation folder: /lib/modules/$(uname -r)/updates/ i40e-cvl-4.0.1 iavf-cvl-4.0.1 ice-cvl-4.0.1 Testing: - An ISO image can be built successfully. - PXE boot-based installation onto an All-in-One Duplex lab was successful with rt and std kernels. - Latest driver versions are loaded by default and the DDP firmware version is correct. It is 1.3.30.0. - It is possible to switch to the legacy drivers manually with command line parameter multi-drivers-switch=cvl-2.54, and the DDP firmware version is 1.3.26.0. - It is also possible to switch back to the latest drivers manually with command line parameter multi-drivers-switch=cvl-4.0.1. Story: 2010326 Task: 46705 Signed-off-by: Jiping Ma Change-Id: Ic20922dacee0807b908354189ec185ace2737810 --- debian_pkg_dirs | 6 +++--- debian_pkg_dirs_rt | 6 +++--- .../debian/deb_folder/changelog | 5 ----- .../intel-i40e-cvl-2.54/debian/deb_folder/changelog | 11 +++++++++++ .../debian/deb_folder/control | 8 ++++---- .../debian/deb_folder/copyright | 0 .../i40e-Enable-getting-link-status-from-VF.patch | 0 ...e-add-more-debug-info-for-VFs-still-in-reset.patch | 0 .../i40e_main-Use-irq_update_affinity_hint.patch | 0 .../debian/deb_folder/patches/series | 0 .../debian/deb_folder/rules | 9 +++++---- .../debian/deb_folder/source/format | 0 .../debian/meta_data.yaml | 2 +- kernel-modules/intel-i40e/debian/deb_folder/rules | 5 +++-- .../debian/deb_folder/changelog | 5 ----- .../intel-iavf-cvl-2.54/debian/deb_folder/changelog | 11 +++++++++++ .../debian/deb_folder/control | 8 ++++---- .../debian/deb_folder/copyright | 0 .../debian/deb_folder/patches/Fix-build-issues.patch | 0 .../iavf_main-Use-irq_update_affinity_hint.patch | 0 .../debian/deb_folder/patches/series | 0 .../debian/deb_folder/rules | 9 +++++---- .../debian/deb_folder/source/format | 0 .../debian/meta_data.yaml | 2 +- kernel-modules/intel-iavf/debian/deb_folder/rules | 5 +++-- .../debian/deb_folder/changelog | 5 ----- .../intel-ice-cvl-2.54/debian/deb_folder/changelog | 11 +++++++++++ .../debian/deb_folder/control | 8 ++++---- .../debian/deb_folder/copyright | 0 ...Avoid-dependency-on-napi_busy_loop-with-PREE.patch | 0 ...ce_main-ice_lib-Use-irq_update_affinity_hint.patch | 0 ...3-ddp-change-ddp-file-name-for-legacy-driver.patch | 0 .../debian/deb_folder/patches/series | 0 .../debian/deb_folder/rules | 9 +++++---- .../debian/deb_folder/source/format | 0 .../debian/meta_data.yaml | 2 +- kernel-modules/intel-ice/debian/deb_folder/rules | 5 +++-- 37 files changed, 78 insertions(+), 54 deletions(-) delete mode 100644 kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/changelog create mode 100644 kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/changelog rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/control (81%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/copyright (100%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/patches/i40e-Enable-getting-link-status-from-VF.patch (100%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/patches/i40e-add-more-debug-info-for-VFs-still-in-reset.patch (100%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/patches/i40e_main-Use-irq_update_affinity_hint.patch (100%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/patches/series (100%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/rules (92%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/deb_folder/source/format (100%) rename kernel-modules/{intel-i40e-2.14.13-legacy => intel-i40e-cvl-2.54}/debian/meta_data.yaml (92%) delete mode 100644 kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/changelog create mode 100644 kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/changelog rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/deb_folder/control (82%) rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/deb_folder/copyright (100%) rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/deb_folder/patches/Fix-build-issues.patch (100%) rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/deb_folder/patches/iavf_main-Use-irq_update_affinity_hint.patch (100%) rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/deb_folder/patches/series (100%) rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/deb_folder/rules (92%) rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/deb_folder/source/format (100%) rename kernel-modules/{intel-iavf-4.0.1-legacy => intel-iavf-cvl-2.54}/debian/meta_data.yaml (92%) delete mode 100644 kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/changelog create mode 100644 kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/changelog rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/control (84%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/copyright (100%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/patches/0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch (100%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/patches/0002-ice_main-ice_lib-Use-irq_update_affinity_hint.patch (100%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/patches/0003-ddp-change-ddp-file-name-for-legacy-driver.patch (100%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/patches/series (100%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/rules (94%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/deb_folder/source/format (100%) rename kernel-modules/{intel-ice-1.5.8.1-legacy => intel-ice-cvl-2.54}/debian/meta_data.yaml (92%) diff --git a/debian_pkg_dirs b/debian_pkg_dirs index f14dc4fb..ab4ad7da 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,11 +1,11 @@ kernel-std kernel-modules/bnxt_en kernel-modules/intel-i40e -kernel-modules/intel-i40e-2.14.13-legacy +kernel-modules/intel-i40e-cvl-2.54 kernel-modules/intel-iavf -kernel-modules/intel-iavf-4.0.1-legacy +kernel-modules/intel-iavf-cvl-2.54 kernel-modules/intel-ice -kernel-modules/intel-ice-1.5.8.1-legacy +kernel-modules/intel-ice-cvl-2.54 kernel-modules/intel-igb_uio kernel-modules/intel-opae-fpga kernel-modules/mlnx-ofa_kernel diff --git a/debian_pkg_dirs_rt b/debian_pkg_dirs_rt index f552c82d..3da9ba79 100644 --- a/debian_pkg_dirs_rt +++ b/debian_pkg_dirs_rt @@ -1,11 +1,11 @@ kernel-rt kernel-modules/bnxt_en kernel-modules/intel-i40e -kernel-modules/intel-i40e-2.14.13-legacy +kernel-modules/intel-i40e-cvl-2.54 kernel-modules/intel-iavf -kernel-modules/intel-iavf-4.0.1-legacy +kernel-modules/intel-iavf-cvl-2.54 kernel-modules/intel-ice -kernel-modules/intel-ice-1.5.8.1-legacy +kernel-modules/intel-ice-cvl-2.54 kernel-modules/intel-igb_uio kernel-modules/intel-opae-fpga kernel-modules/mlnx-ofa_kernel diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/changelog b/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/changelog deleted file mode 100644 index c4c8fdee..00000000 --- a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/changelog +++ /dev/null @@ -1,5 +0,0 @@ -i40e-2.14.13-legacy (2.14.13-1) unstable; urgency=medium - - * Initial release - - -- Jiping Ma Wed, 12 Oct 2022 13:09:50 +0800 diff --git a/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/changelog b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/changelog new file mode 100644 index 00000000..6d21f14b --- /dev/null +++ b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/changelog @@ -0,0 +1,11 @@ +i40e-cvl-2.54 (2.14.13-1) unstable; urgency=medium + + * Change deb package name with bundle version + + -- Jiping Ma Wed, 02 Nov 2022 15:09:35 +0800 + +i40e-2.14.13-legacy (2.14.13-1) unstable; urgency=medium + + * Initial release + + -- Jiping Ma Wed, 12 Oct 2022 13:09:50 +0800 diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/control b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control similarity index 81% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/control rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control index 56f245f2..259beac7 100644 --- a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/control +++ b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control @@ -1,4 +1,4 @@ -Source: i40e-2.14.13-legacy +Source: i40e-cvl-2.54 Section: net Priority: optional Maintainer: StarlingX Developers @@ -6,14 +6,14 @@ Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERN Standards-Version: 4.5.1 Rules-Requires-Root: no -Package: i40e-2.14.13-legacy@KERNEL_TYPE@ +Package: i40e-cvl-2.54@KERNEL_TYPE@ Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, i40e-2.14.13-legacy-common +Depends: ${shlibs:Depends}, ${misc:Depends}, i40e-cvl-2.54-common Description: This package provides the i40e kernel module(s). This package provides the i40e kernel module(s) built for the Linux kernel using the amd64 processors. -Package: i40e-2.14.13-legacy-common +Package: i40e-cvl-2.54-common Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: This package provides the common files of i40e kernel module(s). diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/copyright b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/copyright similarity index 100% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/copyright rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/copyright diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/i40e-Enable-getting-link-status-from-VF.patch b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/i40e-Enable-getting-link-status-from-VF.patch similarity index 100% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/i40e-Enable-getting-link-status-from-VF.patch rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/i40e-Enable-getting-link-status-from-VF.patch diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/i40e-add-more-debug-info-for-VFs-still-in-reset.patch b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/i40e-add-more-debug-info-for-VFs-still-in-reset.patch similarity index 100% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/i40e-add-more-debug-info-for-VFs-still-in-reset.patch rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/i40e-add-more-debug-info-for-VFs-still-in-reset.patch diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/i40e_main-Use-irq_update_affinity_hint.patch b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/i40e_main-Use-irq_update_affinity_hint.patch similarity index 100% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/i40e_main-Use-irq_update_affinity_hint.patch rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/i40e_main-Use-irq_update_affinity_hint.patch diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/series b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/series similarity index 100% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/patches/series rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/patches/series diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/rules b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules similarity index 92% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/rules rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules index 41f5711f..065bc843 100755 --- a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/rules +++ b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules @@ -32,10 +32,11 @@ kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g') kmod_name=i40e version=$(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') +bundle_version=cvl-2.54 ifeq ($(WITH_MOD_SIGN),1) -pkg_name=i40e-2.14.13-legacy@KERNEL_TYPE@ +pkg_name=i40e-$(bundle_version)@KERNEL_TYPE@ endif -pkg_common_name=i40e-2.14.13-legacy-common +pkg_common_name=i40e-$(bundle_version)-common _sysconfdir=/etc _defaultdocdir=/usr/share/doc @@ -48,7 +49,7 @@ pubkey ?= $(_keydir)/signing_key.x509 endif override_dh_auto_install: - dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)-$(version)/ + dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)-$(bundle_version)/ dh_install -p$(pkg_common_name) pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) $(kmod_name).7 $(_mandir)/man7/$(kmod_name)-$(version)/ @@ -59,7 +60,7 @@ override_dh_strip: ifeq ($(WITH_MOD_SIGN),1) @echo "Sign the modules!" /usr/lib/linux@KERNEL_TYPE@-kbuild-*/scripts/sign-file sha256 $(privkey) $(pubkey) \ - ./debian/$(pkg_name)/lib/modules/$(kversion)/extra/$(kmod_name)-$(version)/$(kmod_name).ko + ./debian/$(pkg_name)/lib/modules/$(kversion)/extra/$(kmod_name)-$(bundle_version)/$(kmod_name).ko endif override_dh_auto_build: diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/source/format b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/source/format similarity index 100% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/deb_folder/source/format rename to kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/source/format diff --git a/kernel-modules/intel-i40e-2.14.13-legacy/debian/meta_data.yaml b/kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml similarity index 92% rename from kernel-modules/intel-i40e-2.14.13-legacy/debian/meta_data.yaml rename to kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml index 06a1f9dd..5cb1348d 100644 --- a/kernel-modules/intel-i40e-2.14.13-legacy/debian/meta_data.yaml +++ b/kernel-modules/intel-i40e-cvl-2.54/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debver: 2.14.13 -debname: i40e-2.14.13-legacy +debname: i40e-cvl-2.54 dl_path: name: i40e-2.14.13.tar.gz url: "https://sourceforge.net/projects/e1000/files/i40e%20stable/\ diff --git a/kernel-modules/intel-i40e/debian/deb_folder/rules b/kernel-modules/intel-i40e/debian/deb_folder/rules index 29bb2b28..7cd46e70 100755 --- a/kernel-modules/intel-i40e/debian/deb_folder/rules +++ b/kernel-modules/intel-i40e/debian/deb_folder/rules @@ -36,6 +36,7 @@ ifeq ($(WITH_MOD_SIGN),1) pkg_name=i40e@KERNEL_TYPE@ endif pkg_common_name=i40e-common +bundle_version=cvl-4.0.1 _sysconfdir=/etc _defaultdocdir=/usr/share/doc @@ -48,7 +49,7 @@ pubkey ?= $(_keydir)/signing_key.x509 endif override_dh_auto_install: - dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/updates/$(kmod_name)/ + dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/updates/$(kmod_name)-$(bundle_version)/ dh_install -p$(pkg_common_name) pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) $(kmod_name).7 $(_mandir)/man7/ @@ -60,7 +61,7 @@ override_dh_strip: ifeq ($(WITH_MOD_SIGN),1) @echo "Sign the modules!" /usr/lib/linux@KERNEL_TYPE@-kbuild-*/scripts/sign-file sha256 $(privkey) $(pubkey) \ - ./debian/$(pkg_name)/lib/modules/$(kversion)/updates/$(kmod_name)/$(kmod_name).ko + ./debian/$(pkg_name)/lib/modules/$(kversion)/updates/$(kmod_name)-$(bundle_version)/$(kmod_name).ko endif override_dh_auto_build: diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/changelog b/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/changelog deleted file mode 100644 index ab11b127..00000000 --- a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/changelog +++ /dev/null @@ -1,5 +0,0 @@ -iavf-4.0.1-legacy (4.0.1-1) unstable; urgency=medium - - * Initial release - - -- Jiping Ma Wed, 12 Oct 2022 14:30:42 +0800 diff --git a/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/changelog b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/changelog new file mode 100644 index 00000000..c33ed629 --- /dev/null +++ b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/changelog @@ -0,0 +1,11 @@ +iavf-cvl-2.54 (4.0.1-1) unstable; urgency=medium + + * Change deb package name with the bundle version + + -- Jiping Ma Wed, 02 Nov 2022 15:30:48 +0800 + +iavf-4.0.1-legacy (4.0.1-1) unstable; urgency=medium + + * Initial release + + -- Jiping Ma Wed, 12 Oct 2022 14:30:42 +0800 diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/control b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control similarity index 82% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/control rename to kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control index 29b157b0..e4d9160a 100644 --- a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/control +++ b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control @@ -1,4 +1,4 @@ -Source: iavf-4.0.1-legacy +Source: iavf-cvl-2.54 Section: net Priority: optional Maintainer: StarlingX Developers @@ -6,14 +6,14 @@ Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERN Standards-Version: 4.5.1 Rules-Requires-Root: no -Package: iavf-4.0.1-legacy@KERNEL_TYPE@ +Package: iavf-cvl-2.54@KERNEL_TYPE@ Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iavf-4.0.1-legacy-common +Depends: ${shlibs:Depends}, ${misc:Depends}, iavf-cvl-2.54-common Description: This package provides the iavf kernel module(s). This package provides the iavf kernel module(s) built for the Linux kernel using the amd64 processors. -Package: iavf-4.0.1-legacy-common +Package: iavf-cvl-2.54-common Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: This package provides the common files of iavf kernel module(s). diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/copyright b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/copyright similarity index 100% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/copyright rename to kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/copyright diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/patches/Fix-build-issues.patch b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/patches/Fix-build-issues.patch similarity index 100% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/patches/Fix-build-issues.patch rename to kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/patches/Fix-build-issues.patch diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/patches/iavf_main-Use-irq_update_affinity_hint.patch b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/patches/iavf_main-Use-irq_update_affinity_hint.patch similarity index 100% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/patches/iavf_main-Use-irq_update_affinity_hint.patch rename to kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/patches/iavf_main-Use-irq_update_affinity_hint.patch diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/patches/series b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/patches/series similarity index 100% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/patches/series rename to kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/patches/series diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/rules b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules similarity index 92% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/rules rename to kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules index 4f429c86..e7797798 100755 --- a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/rules +++ b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules @@ -33,11 +33,12 @@ export KSRC_COMMON=/usr/src/$(kheaders_common) kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g') kmod_name=iavf version=$(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') +bundle_version=cvl-2.54 ifeq ($(WITH_MOD_SIGN),1) -pkg_name=iavf-4.0.1-legacy@KERNEL_TYPE@ +pkg_name=iavf-$(bundle_version)@KERNEL_TYPE@ endif -pkg_common_name=iavf-4.0.1-legacy-common +pkg_common_name=iavf-$(bundle_version)-common _sysconfdir=/etc _defaultdocdir=/usr/share/doc @@ -50,7 +51,7 @@ pubkey ?= $(_keydir)/signing_key.x509 endif override_dh_auto_install: - dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)-$(version)/ + dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)-$(bundle_version)/ dh_install -p$(pkg_common_name) pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) $(kmod_name).7 $(_mandir)/man7/$(kmod_name)-$(version)/ @@ -61,7 +62,7 @@ override_dh_strip: ifeq ($(WITH_MOD_SIGN),1) @echo "Sign the modules!" /usr/lib/linux@KERNEL_TYPE@-kbuild-*/scripts/sign-file sha256 $(privkey) $(pubkey) \ - ./debian/$(pkg_name)/lib/modules/$(kversion)/extra/$(kmod_name)-$(version)/$(kmod_name).ko + ./debian/$(pkg_name)/lib/modules/$(kversion)/extra/$(kmod_name)-$(bundle_version)/$(kmod_name).ko endif override_dh_auto_build: diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/source/format b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/source/format similarity index 100% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/deb_folder/source/format rename to kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/source/format diff --git a/kernel-modules/intel-iavf-4.0.1-legacy/debian/meta_data.yaml b/kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml similarity index 92% rename from kernel-modules/intel-iavf-4.0.1-legacy/debian/meta_data.yaml rename to kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml index 5d3ad420..b0201cf7 100644 --- a/kernel-modules/intel-iavf-4.0.1-legacy/debian/meta_data.yaml +++ b/kernel-modules/intel-iavf-cvl-2.54/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debver: 4.0.1 -debname: iavf-4.0.1-legacy +debname: iavf-cvl-2.54 dl_path: name: iavf-4.0.1.tar.gz url: "https://sourceforge.net/projects/e1000/files/iavf%20stable/\ diff --git a/kernel-modules/intel-iavf/debian/deb_folder/rules b/kernel-modules/intel-iavf/debian/deb_folder/rules index 0f01a6a2..aba5ceee 100755 --- a/kernel-modules/intel-iavf/debian/deb_folder/rules +++ b/kernel-modules/intel-iavf/debian/deb_folder/rules @@ -38,6 +38,7 @@ ifeq ($(WITH_MOD_SIGN),1) pkg_name=iavf@KERNEL_TYPE@ endif pkg_common_name=iavf-common +bundle_version=cvl-4.0.1 _sysconfdir=/etc _defaultdocdir=/usr/share/doc @@ -50,7 +51,7 @@ pubkey ?= $(_keydir)/signing_key.x509 endif override_dh_auto_install: - dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/updates/$(kmod_name)/ + dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/updates/$(kmod_name)-$(bundle_version)/ dh_install -p$(pkg_common_name) pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) $(kmod_name).7 $(_mandir)/man7/ @@ -62,7 +63,7 @@ override_dh_strip: ifeq ($(WITH_MOD_SIGN),1) @echo "Sign the modules!" /usr/lib/linux@KERNEL_TYPE@-kbuild-*/scripts/sign-file sha256 $(privkey) $(pubkey) \ - ./debian/$(pkg_name)/lib/modules/$(kversion)/updates/$(kmod_name)/$(kmod_name).ko + ./debian/$(pkg_name)/lib/modules/$(kversion)/updates/$(kmod_name)-$(bundle_version)/$(kmod_name).ko endif override_dh_auto_build: diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/changelog b/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/changelog deleted file mode 100644 index fc321b4e..00000000 --- a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/changelog +++ /dev/null @@ -1,5 +0,0 @@ -ice-1.5.8.1-legacy (1.5.8.1-1) unstable; urgency=medium - - * Initial release - - -- Jiping Ma Wed, 12 Oct 2022 13:09:50 +0800 diff --git a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/changelog b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/changelog new file mode 100644 index 00000000..689bbe29 --- /dev/null +++ b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/changelog @@ -0,0 +1,11 @@ +ice-cvl-2.54 (1.5.8.1-1) unstable; urgency=medium + + * Change deb package name with the bundle version + + -- Jiping Ma Wed, 02 Nov 2022 15:09:20 +0800 + +ice-1.5.8.1-legacy (1.5.8.1-1) unstable; urgency=medium + + * Initial release + + -- Jiping Ma Wed, 12 Oct 2022 13:09:50 +0800 diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/control b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control similarity index 84% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/control rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control index 1377d901..bed7e299 100644 --- a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/control +++ b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control @@ -1,4 +1,4 @@ -Source: ice-1.5.8.1-legacy +Source: ice-cvl-2.54 Section: net Priority: optional Maintainer: StarlingX Developers @@ -6,15 +6,15 @@ Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERN Standards-Version: 4.5.1 Rules-Requires-Root: no -Package: ice-1.5.8.1-legacy@KERNEL_TYPE@ +Package: ice-cvl-2.54@KERNEL_TYPE@ Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ice-1.5.8.1-legacy-common +Depends: ${shlibs:Depends}, ${misc:Depends}, ice-cvl-2.54-common Description: This package provides the ice kernel module(s). This package provides the ice kernel module(s) built for the Linux kernel using the amd64 processors. This package contains the Intel(R) Ethernet Connection E800 Series Linux Driver. -Package: ice-1.5.8.1-legacy-common +Package: ice-cvl-2.54-common Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: This package provides the common files of ice kernel module(s). diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/copyright b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/copyright similarity index 100% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/copyright rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/copyright diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch similarity index 100% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/0002-ice_main-ice_lib-Use-irq_update_affinity_hint.patch b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0002-ice_main-ice_lib-Use-irq_update_affinity_hint.patch similarity index 100% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/0002-ice_main-ice_lib-Use-irq_update_affinity_hint.patch rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0002-ice_main-ice_lib-Use-irq_update_affinity_hint.patch diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/0003-ddp-change-ddp-file-name-for-legacy-driver.patch b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0003-ddp-change-ddp-file-name-for-legacy-driver.patch similarity index 100% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/0003-ddp-change-ddp-file-name-for-legacy-driver.patch rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/0003-ddp-change-ddp-file-name-for-legacy-driver.patch diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/series b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/series similarity index 100% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/patches/series rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/patches/series diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/rules b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules similarity index 94% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/rules rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules index 001417c4..7badbd8b 100755 --- a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/rules +++ b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules @@ -32,9 +32,10 @@ export KSRC=/usr/src/$(kheaders_name) export KSRC_COMMON=/usr/src/$(kheaders_common) kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g') kmod_name=ice +bundle_version=cvl-2.54 version=$(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') -pkg_name=ice-1.5.8.1-legacy@KERNEL_TYPE@ -pkg_common_name=ice-1.5.8.1-legacy-common +pkg_name=ice-$(bundle_version)@KERNEL_TYPE@ +pkg_common_name=ice-$(bundle_version)-common _sysconfdir=/etc _defaultdocdir=/usr/share/doc @@ -47,7 +48,7 @@ pubkey ?= $(_keydir)/signing_key.x509 endif override_dh_auto_install: - dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)-$(version)/ + dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/extra/$(kmod_name)-$(bundle_version)/ dh_install -p$(pkg_common_name) pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) $(kmod_name).7 $(_mandir)/man7/$(kmod_name)-$(version)/ @@ -66,7 +67,7 @@ override_dh_strip: ifeq ($(WITH_MOD_SIGN),1) @echo "Sign the modules!" /usr/lib/linux@KERNEL_TYPE@-kbuild-*/scripts/sign-file sha256 $(privkey) $(pubkey) \ - ./debian/$(pkg_name)/lib/modules/$(kversion)/extra/$(kmod_name)-$(version)/$(kmod_name).ko + ./debian/$(pkg_name)/lib/modules/$(kversion)/extra/$(kmod_name)-$(bundle_version)/$(kmod_name).ko endif override_dh_auto_build: diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/source/format b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/source/format similarity index 100% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/deb_folder/source/format rename to kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/source/format diff --git a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/meta_data.yaml b/kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml similarity index 92% rename from kernel-modules/intel-ice-1.5.8.1-legacy/debian/meta_data.yaml rename to kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml index b2929fe0..a4042c80 100644 --- a/kernel-modules/intel-ice-1.5.8.1-legacy/debian/meta_data.yaml +++ b/kernel-modules/intel-ice-cvl-2.54/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debver: 1.5.8.1 -debname: ice-1.5.8.1-legacy +debname: ice-cvl-2.54 dl_path: name: ice-1.5.8.1.tar.gz url: "https://sourceforge.net/projects/e1000/files/unsupported/\ diff --git a/kernel-modules/intel-ice/debian/deb_folder/rules b/kernel-modules/intel-ice/debian/deb_folder/rules index a42e3512..3e85540a 100755 --- a/kernel-modules/intel-ice/debian/deb_folder/rules +++ b/kernel-modules/intel-ice/debian/deb_folder/rules @@ -35,6 +35,7 @@ kmod_name=ice version=$(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p') pkg_name=ice@KERNEL_TYPE@ pkg_common_name=ice-common +bundle_version=cvl-4.0.1 _sysconfdir=/etc _defaultdocdir=/usr/share/doc @@ -47,7 +48,7 @@ pubkey ?= $(_keydir)/signing_key.x509 endif override_dh_auto_install: - dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/updates/$(kmod_name)/ + dh_install src/$(kmod_name).ko /lib/modules/$(kversion)/updates/$(kmod_name)-$(bundle_version)/ dh_install -p$(pkg_common_name) pci.updates $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) $(kmod_name).7 $(_mandir)/man7/ @@ -69,7 +70,7 @@ override_dh_strip: ifeq ($(WITH_MOD_SIGN),1) @echo "Sign the modules!" /usr/lib/linux@KERNEL_TYPE@-kbuild-*/scripts/sign-file sha256 $(privkey) $(pubkey) \ - ./debian/$(pkg_name)/lib/modules/$(kversion)/updates/$(kmod_name)/$(kmod_name).ko + ./debian/$(pkg_name)/lib/modules/$(kversion)/updates/$(kmod_name)-$(bundle_version)/$(kmod_name).ko endif override_dh_auto_build: