starlingx/kernel
Code Issues Proposed changes

kernel-modules: Build-Depends on linux-headers-stx-amd64

Browse Source 
Remove the kernel abiname/version from Build-Depends in OOT kernel
modules. After commit <Add pkgs without abiname for image/headers>
the new dependency is as this:
linux-kbuild-5.10 is depended by linux-headers-5.10.0-6-amd64;
linux-headers-5.10.0-6-amd64 is depended by linux-headers-stx-amd64.

Package linux-keys-5.10 is renamed to linux-keys.
Then the version numbers and abiname can be completely removed from
the Build-Depends of OOT kernel modules' codes.

Similar is done for RT kernel modules.

This is a preparation for kernel upgrading with major version.

Test plan:
 PASS: Build all the packages and iso successfully.
 PASS: The rt/std installations are fine for both qemu and lib.
 PASS: No warning appears for insmod/modprobe.

Depends-On: https://review.opendev.org/c/starlingx/kernel/+/896187

Story: 2010643
Task: 48815

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Change-Id: I860a751cf4c11f64c81877714ecddb10b488fa96
This commit is contained in:
Li Zhou
2023-09-15 11:10:25 +08:00
parent 5cc80444d7
commit 8fed8973bc
18 changed files with 16 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-modules/bnxt_en/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: bnxt-en
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10, mlnx-ofed-kernel-dev
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, mlnx-ofed-kernel-dev
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: i40e-cvl-2.54
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: i40e-cvl-4.10
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-i40e/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: i40e
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: iavf-cvl-2.54
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: iavf-cvl-4.10
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-iavf/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: iavf
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: ice-cvl-2.54
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10, unzip
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, unzip
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: ice-cvl-4.10
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10, unzip
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, unzip
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-ice/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: ice
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10, unzip
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, unzip
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-igb_uio/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: igb-uio
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-opae-fpga/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: kmod-opae-fpga-driver
Section: kernel
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10, perl, openssl
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, perl, openssl
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/intel-qv/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: iqvlinux
Section: kernel
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch
View File

@@ -45,7 +45,7 @@ index 2ed05f9..ba886e2 100644
Priority: optional
Maintainer: Vladimir Sokolovsky <vlad@mellanox.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms,
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms, linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms, linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 3.9.2
Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers

26
kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0003-Add-linux-keys-on-Build-Depends.patch
View File

@@ -1,26 +0,0 @@
From 252021473cb9391e6be91f2b3b4c807c3038be70 Mon Sep 17 00:00:00 2001
From: Jiping Ma <jiping.ma2@windriver.com>
Date: Tue, 27 Sep 2022 22:21:07 -0700
Subject: [PATCH] Add linux-keys on Build-Depends
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 632b653..14ac5b1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mlnx-ofed-kernel
Section: net
Priority: optional
Maintainer: Vladimir Sokolovsky <vlad@mellanox.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms, linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms, linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Standards-Version: 3.9.2
Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers
--
2.35.1

1
kernel-modules/mlnx-ofa_kernel/debian/deb_patches/series
View File

@@ -1,3 +1,2 @@
0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch
0002-mlnx-ofa_kernel-Add-dev-package.patch
0003-Add-linux-keys-on-Build-Depends.patch

2
kernel-modules/octeon_ep/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: octeon-ep
Section: net
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no

2
kernel-modules/qat/debian/deb_folder/control
View File

@@ -2,7 +2,7 @@ Source: qat2.0.l
Section: kernel
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), autotools-dev, pkg-config, libudev-dev, yasm, libssl-dev, libz-dev, pciutils, libboost-dev, perl, openssl, libboost-regex-dev,linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, linux@KERNEL_TYPE@-keys-5.10
Build-Depends: debhelper-compat (= 13), autotools-dev, pkg-config, libudev-dev, yasm, libssl-dev, libz-dev, pciutils, libboost-dev, perl, openssl, libboost-regex-dev, linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
Standards-Version: 4.5.1
Rules-Requires-Root: no