From 478dfdb4e9ce0c616481d30aab97c8a7e17e8371 Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Thu, 28 Apr 2022 02:27:52 +0000 Subject: [PATCH] Debian: kernel-rt: add support for multi kernels Adding an extra '-rt' to abiname can change '5.10.0-6-amd64' in file names/paths to '5.10.0-6-rt-amd64'. In this way, the same names/paths in kernel-rt and kernel-std packages can be avoided. This is what multi kernels feature need. With the abiname change, the "5.10.0-6" in some kernel-rt packages' names is changed to "5.10.0-6-rt". e.g. linux-rt-headers-5.10.0-6-amd64 is changed to linux-rt-headers-5.10.0-6-rt-amd64. So change this package name in the control files of the oot kernel modules to avoid build errors. Test plan: [Test together with all the patches about supporting multi-kernel feature (kernel part).] - PASS: Build std kernel and its kernel modules OK. Build std image OK. Boot on qemu OK. Boot on target ProLiant ML350 Gen10 OK. - PASS: Do above tests for kernel-rt too. Depends-On: https://review.opendev.org/c/starlingx/tools/+/842030 Story: 2009221 Task: 45380 Signed-off-by: Li Zhou Change-Id: Id620e7588b702ed4f621cae4c5206688371d2d3e --- .../bnxt_en/debian/deb_folder/control | 2 +- .../intel-i40e/debian/deb_folder/control | 2 +- .../intel-iavf/debian/deb_folder/control | 2 +- .../intel-ice/debian/deb_folder/control | 2 +- .../intel-igb_uio/debian/deb_folder/control | 2 +- .../intel-opae-fpga/debian/deb_folder/control | 2 +- ...adapt-the-debian-folder-for-starling.patch | 2 +- .../qat17/debian/deb_folder/control | 2 +- .../0012-kernel-rt-add-rt-to-abiname.patch | 29 +++++++++++++++++++ kernel-rt/debian/deb_patches/series | 1 + 10 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 kernel-rt/debian/deb_patches/0012-kernel-rt-add-rt-to-abiname.patch diff --git a/kernel-modules/bnxt_en/debian/deb_folder/control b/kernel-modules/bnxt_en/debian/deb_folder/control index 65df3ba5..5e89a6be 100644 --- a/kernel-modules/bnxt_en/debian/deb_folder/control +++ b/kernel-modules/bnxt_en/debian/deb_folder/control @@ -2,7 +2,7 @@ Source: bnxt-en Section: net Priority: optional Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6-amd64, linux@KERNEL_TYPE@-kbuild-5.10, mlnx-ofed-kernel-modules@KERNEL_TYPE@ +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, mlnx-ofed-kernel-modules@KERNEL_TYPE@ Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/kernel-modules/intel-i40e/debian/deb_folder/control b/kernel-modules/intel-i40e/debian/deb_folder/control index d574bec8..e0942dd8 100644 --- a/kernel-modules/intel-i40e/debian/deb_folder/control +++ b/kernel-modules/intel-i40e/debian/deb_folder/control @@ -2,7 +2,7 @@ Source: i40e Section: net Priority: optional Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6-amd64, linux@KERNEL_TYPE@-kbuild-5.10 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10 Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/kernel-modules/intel-iavf/debian/deb_folder/control b/kernel-modules/intel-iavf/debian/deb_folder/control index 4bf107b6..baa57938 100644 --- a/kernel-modules/intel-iavf/debian/deb_folder/control +++ b/kernel-modules/intel-iavf/debian/deb_folder/control @@ -2,7 +2,7 @@ Source: iavf Section: net Priority: optional Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6-amd64, linux@KERNEL_TYPE@-kbuild-5.10 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10 Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/kernel-modules/intel-ice/debian/deb_folder/control b/kernel-modules/intel-ice/debian/deb_folder/control index 19108e56..599e01d9 100644 --- a/kernel-modules/intel-ice/debian/deb_folder/control +++ b/kernel-modules/intel-ice/debian/deb_folder/control @@ -2,7 +2,7 @@ Source: ice Section: net Priority: optional Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6-amd64, linux@KERNEL_TYPE@-kbuild-5.10, unzip +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, unzip Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/kernel-modules/intel-igb_uio/debian/deb_folder/control b/kernel-modules/intel-igb_uio/debian/deb_folder/control index ebb62d67..dd17859a 100644 --- a/kernel-modules/intel-igb_uio/debian/deb_folder/control +++ b/kernel-modules/intel-igb_uio/debian/deb_folder/control @@ -2,7 +2,7 @@ Source: igb-uio Section: net Priority: optional Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6-amd64, linux@KERNEL_TYPE@-kbuild-5.10 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10 Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/kernel-modules/intel-opae-fpga/debian/deb_folder/control b/kernel-modules/intel-opae-fpga/debian/deb_folder/control index 664a1297..79a14963 100644 --- a/kernel-modules/intel-opae-fpga/debian/deb_folder/control +++ b/kernel-modules/intel-opae-fpga/debian/deb_folder/control @@ -2,7 +2,7 @@ Source: kmod-opae-fpga-driver Section: kernel Priority: optional Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6-amd64, linux@KERNEL_TYPE@-kbuild-5.10, perl, openssl +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10, perl, openssl Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch b/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch index 4e87a51f..0fd1659e 100644 --- a/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch +++ b/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch @@ -44,7 +44,7 @@ index 2ed05f9..9abdfad 100644 Priority: optional Maintainer: Vladimir Sokolovsky -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-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 Standards-Version: 3.9.2 Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers diff --git a/kernel-modules/qat17/debian/deb_folder/control b/kernel-modules/qat17/debian/deb_folder/control index 1e0d4def..f36097e9 100644 --- a/kernel-modules/qat17/debian/deb_folder/control +++ b/kernel-modules/qat17/debian/deb_folder/control @@ -2,7 +2,7 @@ Source: qat1.7.l Section: kernel Priority: optional Maintainer: StarlingX Developers -Build-Depends: debhelper-compat (= 13), autotools-dev, pkg-config, libudev-dev, yasm, libssl-dev, libz-dev, pciutils, libboost-dev, perl, openssl, linux@KERNEL_TYPE@-headers-5.10.0-6-amd64, linux@KERNEL_TYPE@-kbuild-5.10 +Build-Depends: debhelper-compat (= 13), autotools-dev, pkg-config, libudev-dev, yasm, libssl-dev, libz-dev, pciutils, libboost-dev, perl, openssl, linux@KERNEL_TYPE@-headers-5.10.0-6@KERNEL_TYPE@-amd64, linux@KERNEL_TYPE@-kbuild-5.10 Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/kernel-rt/debian/deb_patches/0012-kernel-rt-add-rt-to-abiname.patch b/kernel-rt/debian/deb_patches/0012-kernel-rt-add-rt-to-abiname.patch new file mode 100644 index 00000000..8c88655b --- /dev/null +++ b/kernel-rt/debian/deb_patches/0012-kernel-rt-add-rt-to-abiname.patch @@ -0,0 +1,29 @@ +From c150984dea33d04e08edb7ddfde3fab79d3fc824 Mon Sep 17 00:00:00 2001 +From: Li Zhou +Date: Thu, 28 Apr 2022 10:16:20 +0800 +Subject: [PATCH] kernel-rt: add '-rt' to abiname + +Adding an extra '-rt' to abiname can change '5.10.0-6-amd64' +in file names/paths to '5.10.0-6-rt-amd64'. +In this way, the same names/paths in kernel-rt and kernel-std +packages can be avoided. + +Signed-off-by: Li Zhou +--- + debian/config/defines | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/config/defines b/debian/config/defines +index ee09bd2..828b481 100644 +--- a/debian/config/defines ++++ b/debian/config/defines +@@ -1,5 +1,5 @@ + [abi] +-abiname: 6 ++abiname: 6-rt + ignore-changes: + __cpuhp_* + __udp_gso_segment +-- +2.17.1 + diff --git a/kernel-rt/debian/deb_patches/series b/kernel-rt/debian/deb_patches/series index 6324cd82..1bcb25bb 100644 --- a/kernel-rt/debian/deb_patches/series +++ b/kernel-rt/debian/deb_patches/series @@ -9,3 +9,4 @@ 0009-Drop-Android-patches.patch 0010-Debian-Disable-CONFIG_BNXT.patch 0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch +0012-kernel-rt-add-rt-to-abiname.patch