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 <li.zhou@windriver.com> Change-Id: Id620e7588b702ed4f621cae4c5206688371d2d3e
This commit is contained in:
parent
3a5210054e
commit
478dfdb4e9
@ -2,7 +2,7 @@ Source: bnxt-en
|
|||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
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
|
Standards-Version: 4.5.1
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Source: i40e
|
|||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
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
|
Standards-Version: 4.5.1
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Source: iavf
|
|||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
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
|
Standards-Version: 4.5.1
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Source: ice
|
|||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
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
|
Standards-Version: 4.5.1
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Source: igb-uio
|
|||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
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
|
Standards-Version: 4.5.1
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Source: kmod-opae-fpga-driver
|
|||||||
Section: kernel
|
Section: kernel
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
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
|
Standards-Version: 4.5.1
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ index 2ed05f9..9abdfad 100644
|
|||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Vladimir Sokolovsky <vlad@mellanox.com>
|
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,
|
||||||
+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
|
Standards-Version: 3.9.2
|
||||||
Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers
|
Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Source: qat1.7.l
|
|||||||
Section: kernel
|
Section: kernel
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
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, 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
|
Standards-Version: 4.5.1
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
|
||||||
|
@ -0,0 +1,29 @@
|
|||||||
|
From c150984dea33d04e08edb7ddfde3fab79d3fc824 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Li Zhou <li.zhou@windriver.com>
|
||||||
|
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 <li.zhou@windriver.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
@ -9,3 +9,4 @@
|
|||||||
0009-Drop-Android-patches.patch
|
0009-Drop-Android-patches.patch
|
||||||
0010-Debian-Disable-CONFIG_BNXT.patch
|
0010-Debian-Disable-CONFIG_BNXT.patch
|
||||||
0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch
|
0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch
|
||||||
|
0012-kernel-rt-add-rt-to-abiname.patch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user