starlingx/kernel
Code Issues Proposed changes

Merge "Debian: remove rt suffix of mlnx-ofed-kernel-utils"

Browse Source
This commit is contained in:
Zuul 2022-05-24 18:18:02 +00:00 committed by Gerrit Code Review
commit b36cb02880
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 216846310710ed1d1e2c7d3440275dad5b2f71ef Mon Sep 17 00:00:00 2001
From 9a9504632c92e954103b7fdd7b59064a94d9ee29 Mon Sep 17 00:00:00 2001
From: Jiping Ma <jiping.ma2@windriver.com>
Date: Wed, 23 Mar 2022 22:59:40 -0700
Subject: [PATCH] mlnx-ofa_kernel: adapt the debian folder for starlingX
@ -18,16 +18,17 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com>
[jm: Adapted the patch for context change, and added postinst,
prerm files for rt build.]
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
---
debian/control | 23 ++++-------
debian/control | 21 +++-------
debian/extra/mlnx.conf | 19 +++++++++
debian/mlnx-ofed-kernel-modules-rt.postinst | 17 ++++++++
debian/mlnx-ofed-kernel-modules-rt.prerm | 10 +++++
debian/mlnx-ofed-kernel-utils-rt.postinst | 46 +++++++++++++++++++++
debian/mlnx-ofed-kernel-utils-rt.postrm | 13 ++++++
debian/mlnx-ofed-kernel-utils-rt.prerm | 22 ++++++++++
debian/rules | 26 +++++++++---
8 files changed, 154 insertions(+), 22 deletions(-)
debian/rules | 24 ++++++++---
8 files changed, 152 insertions(+), 20 deletions(-)
create mode 100644 debian/extra/mlnx.conf
create mode 100755 debian/mlnx-ofed-kernel-modules-rt.postinst
create mode 100755 debian/mlnx-ofed-kernel-modules-rt.prerm
@ -36,10 +37,10 @@ Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
create mode 100755 debian/mlnx-ofed-kernel-utils-rt.prerm
diff --git a/debian/control b/debian/control
index 2ed05f9..9abdfad 100644
index 2ed05f9..ba886e2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,29 +2,20 @@ Source: mlnx-ofed-kernel
@@ -2,7 +2,7 @@ Source: mlnx-ofed-kernel
Section: net
Priority: optional
Maintainer: Vladimir Sokolovsky <vlad@mellanox.com>
@ -48,11 +49,7 @@ index 2ed05f9..9abdfad 100644
Standards-Version: 3.9.2
Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers
-Package: mlnx-ofed-kernel-utils
+Package: mlnx-ofed-kernel-utils@KERNEL_TYPE@
Architecture: any
Depends: ${misc:Depends}, coreutils, pciutils, grep, procps, module-init-tools | kmod, lsof,
mlnx-tools (>= 5.2.0),
@@ -13,18 +13,9 @@ Depends: ${misc:Depends}, coreutils, pciutils, grep, procps, module-init-tools |
Conflicts: mlnx-en-utils
Description: Userspace tools to restart and tune mlnx-ofed kernel modules
@ -70,7 +67,7 @@ index 2ed05f9..9abdfad 100644
- .
+Package: mlnx-ofed-kernel-modules@KERNEL_TYPE@
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, mlnx-ofed-kernel-utils
+Description: ofed kernel modules
+ This package provides the mlnx-ofed out of tree kernel modules.
This package provides the source code for the mlnx-ofed kernel modules.
@ -240,7 +237,7 @@ index 0000000..27f697b
+
+exit 0
diff --git a/debian/rules b/debian/rules
index db99d8c..84b8d80 100755
index db99d8c..df4c725 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,20 @@
@ -266,18 +263,15 @@ index db99d8c..84b8d80 100755
MLXNUMC = $(shell grep ^processor /proc/cpuinfo | wc -l)
NJOBS ?= $(shell if [ $(MLXNUMC) -lt 16 ]; then echo $(MLXNUMC); else echo 16; fi)
@@ -27,9 +39,9 @@ psource:=$(pname)-source
@@ -27,7 +39,7 @@ psource:=$(pname)-source
ifeq ($(WITH_DKMS),1)
pdkms:=$(pname)-dkms
else
-pdkms:=$(pname)-modules
+pdkms:=$(pname)-modules@KERNEL_TYPE@
endif
-putils:=$(pname)-utils
+putils:=$(pname)-utils@KERNEL_TYPE@
putils:=$(pname)-utils
pversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
prel := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-\(.\+\)/\2/p')
@@ -40,7 +52,6 @@ export INSTALL_MOD_PATH:=$(CURDIR)/debian/$(pdkms)
DIST_NAME := $(shell lsb_release -si)
DIST_RELEASE := $(DIST_NAME)/$(shell lsb_release -sc)
@ -299,12 +293,12 @@ index db99d8c..84b8d80 100755
install -m 0755 source/ofed_scripts/odp_stat.sh debian/$(putils)/usr/sbin
install -m 0755 ofed_scripts/mlnx_bf_assign_ct_cores.sh debian/$(putils)/usr/share/mlnx_ofed
+ dh_installdirs -p$(pdkms) /etc/modules-load.d/
+ install -m 644 debian/extra/mlnx.conf debian/$(pdkms)/etc/modules-load.d/
+ dh_installdirs -p$(putils) /etc/modules-load.d/
+ install -m 644 debian/extra/mlnx.conf debian/$(putils)/etc/modules-load.d/
+
override_dh_installinit:
--
2.35.1
2.25.1