Merge "Upversion Mellanox driver to ver 5.0"
This commit is contained in:
commit
f674c2ff37
|
@ -1,3 +1,3 @@
|
|||
mlnx-ofa_kernel-4.7-OFED.4.7.3.2.9.1.g457f064.src.rpm
|
||||
libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm
|
||||
rdma-core-47mlnx1-1.47329.src.rpm
|
||||
mlnx-ofa_kernel-5.0-OFED.5.0.2.1.8.1.g5f67178.src.rpm
|
||||
libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm
|
||||
rdma-core-50mlnx1-1.50218.src.rpm
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
dpdk-20.05.tar.gz#dpdk-20.05#https://fast.dpdk.org/rel/dpdk-20.05.tar.gz#http##
|
||||
drbd-8.4.11-1.tar.gz#drbd-8.4.11-1#http://www.linbit.com/downloads/drbd/8.4/drbd-8.4.11-1.tar.gz#http##
|
||||
e1000e-3.6.0.tar.gz#e1000e-3.6.0#https://sourceforge.net/projects/e1000/files/e1000e%20stable/3.6.0/e1000e-3.6.0.tar.gz#http##
|
||||
i40e-2.11.29.tar.gz#i40e-2.11.29#https://sourceforge.net/projects/e1000/files/i40e%20stable/2.11.29/i40e-2.11.29.tar.gz/download#http##
|
||||
iavf-3.9.5.tar.gz#iavf-3.9.5#https://sourceforge.net/projects/e1000/files/iavf%20stable/3.9.5/iavf-3.9.5.tar.gz/download#http##
|
||||
ixgbe-5.6.5.tar.gz#ixgbe-5.6.5#https://sourceforge.net/projects/e1000/files/ixgbe%20stable/5.6.5/ixgbe-5.6.5.tar.gz/download#http##
|
||||
ixgbevf-4.6.3.tar.gz#ixgbevf-4.6.3#https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/4.6.3/ixgbevf-4.6.3.tar.gz/download#http##
|
||||
dpdk-20.05.tar.gz#dpdk-20.05#https://fast.dpdk.org/rel/dpdk-20.05.tar.gz#http##
|
||||
!kernel-rt-4.18.0-147.3.1.rt24.96.el8_1.src.rpm#kernel-rt#https://git.centos.org/rpms/kernel-rt#http_script#327ec52423c67051249291f131ec7f6fff44a828#post-dl-script/kernel-rt.sh
|
||||
!MLNX_OFED_SRC-5.0-2.1.8.0.tgz#MLNX_OFED_SRC-5.0-2.1.8.0#http://content.mellanox.com/ofed/MLNX_OFED-5.0-2.1.8.0/MLNX_OFED_SRC-5.0-2.1.8.0.tgz#http_script##unused
|
||||
opae-intel-fpga-driver-2.0.1-8.tar.gz#opae-intel-fpga-driver-2.0.1-8#https://github.com/OPAE/opae-sdk/releases/download/1.3.7-4/opae-intel-fpga-driver-2.0.1-8.tar.gz#http##
|
||||
!qat1.7.l.4.5.0-00034.tar.gz#quickassist#https://01.org/sites/default/files/downloads/qat1.7.l.4.5.0-00034.tar.gz#http_script##post-dl-script/qat1.7.sh
|
||||
!kernel-rt-4.18.0-147.3.1.rt24.96.el8_1.src.rpm#kernel-rt#https://git.centos.org/rpms/kernel-rt#http_script#327ec52423c67051249291f131ec7f6fff44a828#post-dl-script/kernel-rt.sh
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
COPY_LIST="$PKG_BASE/files/modules-load.conf"
|
||||
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
|
||||
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
|
||||
PKG_BASE_SRCREV=c3a925b0b8111e9dc958a5934a613f491be71ae3
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+2
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
|
||||
BUILD_IS_SLOW=3
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
From 0d5ddc8227336beccae3f02c4b30386b09a41a0b Mon Sep 17 00:00:00 2001
|
||||
From 3c883e04e3cb1a7483280cf43398f22602ac3062 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <3c883e04e3cb1a7483280cf43398f22602ac3062.1594918114.git.Jim.Somerville@windriver.com>
|
||||
From: Jim Somerville <Jim.Somerville@windriver.com>
|
||||
Date: Mon, 20 Jan 2020 11:40:06 -0500
|
||||
Subject: [PATCH] Support TiS system
|
||||
Subject: [PATCH 1/2] Support TiS system
|
||||
|
||||
This patch added the following to support TiS system:
|
||||
- Support package versioning for TiS format
|
||||
|
@ -23,7 +24,7 @@ Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
|
|||
1 file changed, 35 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec
|
||||
index b123e82..44a31ef 100644
|
||||
index efe2abc..547c6d0 100644
|
||||
--- a/SPECS/mlnx-ofa_kernel.spec
|
||||
+++ b/SPECS/mlnx-ofa_kernel.spec
|
||||
@@ -27,8 +27,14 @@
|
||||
|
@ -42,9 +43,9 @@ index b123e82..44a31ef 100644
|
|||
%global WITH_SYSTEMD %(if ( test -d "%{_unitdir}" > /dev/null); then echo -n '1'; else echo -n '0'; fi)
|
||||
|
||||
%{!?configure_options: %global configure_options --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-mlx4-mod --with-mlx4_en-mod --with-mlx5-mod --with-mlxfw-mod --with-ipoib-mod}
|
||||
@@ -43,12 +49,11 @@
|
||||
# Force python3 on RHEL8 and OL8:
|
||||
%global PYTHON3 %(if test `grep -E '^(ID="(rhel|ol|centos)"|VERSION="8)' /etc/os-release 2>/dev/null | wc -l` -eq 2; then echo -n '1'; else echo -n '0'; fi)
|
||||
@@ -55,12 +61,11 @@
|
||||
|
||||
%global IS_RHEL_VENDOR "%{_vendor}" == "redhat" || ("%{_vendor}" == "bclinux")
|
||||
|
||||
-%{!?KVERSION: %global KVERSION %(uname -r)}
|
||||
+%{!?KVERSION: %global KVERSION %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')}
|
||||
|
@ -57,7 +58,7 @@ index b123e82..44a31ef 100644
|
|||
# Select packages to build
|
||||
|
||||
# Kernel module packages to be included into kernel-ib
|
||||
@@ -64,7 +69,9 @@
|
||||
@@ -76,7 +81,9 @@
|
||||
|
||||
%{!?KERNEL_SOURCES: %global KERNEL_SOURCES /lib/modules/%{KVERSION}/source}
|
||||
|
||||
|
@ -65,10 +66,10 @@ index b123e82..44a31ef 100644
|
|||
+
|
||||
+%define _basename mlnx-ofa_kernel
|
||||
+%define _name %{_basename}%{?bt_ext}
|
||||
%{!?_version: %global _version 4.7}
|
||||
%{!?_release: %global _release OFED.4.7.3.2.9.1.g457f064}
|
||||
%{!?_version: %global _version 5.0}
|
||||
%{!?_release: %global _release OFED.5.0.2.1.8.1.g5f67178}
|
||||
%global _kmp_rel %{_release}%{?_kmp_build_num}%{?_dist}
|
||||
@@ -82,11 +89,17 @@
|
||||
@@ -94,11 +101,17 @@
|
||||
Summary: Infiniband HCA Driver
|
||||
Name: %{_name}
|
||||
Version: %{_version}
|
||||
|
@ -88,7 +89,7 @@ index b123e82..44a31ef 100644
|
|||
BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED}
|
||||
Vendor: Mellanox Technologies
|
||||
Obsoletes: kernel-ib
|
||||
@@ -142,7 +155,6 @@ EOF)
|
||||
@@ -154,7 +167,6 @@ EOF)
|
||||
%global kernel_release() %{KVERSION}
|
||||
%global flavors_to_build default
|
||||
%package -n %{non_kmp_pname}
|
||||
|
@ -96,7 +97,7 @@ index b123e82..44a31ef 100644
|
|||
Requires: coreutils
|
||||
Requires: pciutils
|
||||
Requires: grep
|
||||
@@ -169,7 +181,7 @@ Obsoletes: mlnx-en-doc
|
||||
@@ -181,7 +193,7 @@ Obsoletes: mlnx-en-doc
|
||||
Obsoletes: mlnx-en-debuginfo
|
||||
Obsoletes: mlnx-en-sources
|
||||
Version: %{_version}
|
||||
|
@ -105,7 +106,7 @@ index b123e82..44a31ef 100644
|
|||
Summary: Infiniband Driver and ULPs kernel modules
|
||||
Group: System Environment/Libraries
|
||||
%description -n %{non_kmp_pname}
|
||||
@@ -181,7 +193,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
@@ -193,7 +205,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
%package -n %{devel_pname}
|
||||
Version: %{_version}
|
||||
# build KMP rpms?
|
||||
|
@ -114,7 +115,7 @@ index b123e82..44a31ef 100644
|
|||
Obsoletes: kernel-ib-devel
|
||||
Obsoletes: compat-rdma-devel
|
||||
Obsoletes: kernel-ib
|
||||
@@ -219,13 +231,12 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
@@ -231,13 +243,12 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
else \
|
||||
echo -n '0'; fi)
|
||||
|
||||
|
@ -129,7 +130,7 @@ index b123e82..44a31ef 100644
|
|||
%global buildsubdir %{_name}-%{version}
|
||||
# Disgusting hack alert! We need to ensure we sign modules *after* all
|
||||
# invocations of strip occur, which is in __debug_install_post if
|
||||
@@ -238,7 +249,6 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
@@ -250,7 +261,6 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
%{__modsign_install_post} \
|
||||
%{nil}
|
||||
|
||||
|
@ -137,7 +138,7 @@ index b123e82..44a31ef 100644
|
|||
#
|
||||
%if "%{_vendor}" == "suse"
|
||||
%debug_package
|
||||
@@ -269,7 +279,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
@@ -281,7 +291,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
|
||||
%{!?install_mod_dir: %global install_mod_dir updates}
|
||||
|
||||
%prep
|
||||
|
@ -146,7 +147,7 @@ index b123e82..44a31ef 100644
|
|||
set -- *
|
||||
mkdir source
|
||||
mv "$@" source/
|
||||
@@ -278,6 +288,11 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts`
|
||||
@@ -290,6 +300,11 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts`
|
||||
%endif
|
||||
mkdir obj
|
||||
|
||||
|
@ -158,7 +159,7 @@ index b123e82..44a31ef 100644
|
|||
%build
|
||||
export EXTRA_CFLAGS='-DVERSION=\"%version\"'
|
||||
export INSTALL_MOD_DIR=%{install_mod_dir}
|
||||
@@ -293,7 +308,6 @@ for flavor in %flavors_to_build; do
|
||||
@@ -305,7 +320,6 @@ for flavor in %flavors_to_build; do
|
||||
find compat -type f -exec touch -t 200012201010 '{}' \; || true
|
||||
./configure --build-dummy-mods --prefix=%{_prefix} --kernel-version $KVERSION --kernel-sources $KSRC --modules-dir $LIB_MOD_DIR $CONF_OPTIONS %{?_smp_mflags}
|
||||
make %{?_smp_mflags} kernel
|
||||
|
@ -166,7 +167,7 @@ index b123e82..44a31ef 100644
|
|||
cd -
|
||||
done
|
||||
|
||||
@@ -302,9 +316,11 @@ touch ofed-files
|
||||
@@ -314,9 +328,11 @@ touch ofed-files
|
||||
export RECORD_PY_FILES=1
|
||||
export INSTALL_MOD_PATH=%{buildroot}
|
||||
export INSTALL_MOD_DIR=%{install_mod_dir}
|
||||
|
@ -179,7 +180,7 @@ index b123e82..44a31ef 100644
|
|||
%{mlnx_python_env}
|
||||
for flavor in %flavors_to_build; do
|
||||
export KSRC=%{kernel_source $flavor}
|
||||
@@ -355,6 +371,8 @@ echo "override ${mod_name} * weak-updates/%{_name}${mod_path}" >> %{buildroot}%{
|
||||
@@ -367,6 +383,8 @@ echo "override ${mod_name} * weak-updates/%{_name}${mod_path}" >> %{buildroot}%{
|
||||
echo "override ${mod_name} * extra/%{_name}${mod_path}" >> %{buildroot}%{_sysconfdir}/depmod.d/zz01-%{_name}-${mod_name}.conf
|
||||
done
|
||||
%endif
|
||||
|
@ -188,7 +189,7 @@ index b123e82..44a31ef 100644
|
|||
%endif
|
||||
|
||||
# copy sources
|
||||
@@ -701,6 +719,7 @@ fi
|
||||
@@ -712,6 +730,7 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/depmod.d/zz01-%{_name}-*.conf
|
||||
%endif
|
||||
%endif
|
||||
|
@ -197,5 +198,5 @@ index b123e82..44a31ef 100644
|
|||
|
||||
%files -n %{devel_pname}
|
||||
--
|
||||
2.7.4
|
||||
1.8.3.1
|
||||
|
||||
|
|
|
@ -1,14 +1,18 @@
|
|||
From 372af54951e76f0f03c85a3e99711a400a9e7072 Mon Sep 17 00:00:00 2001
|
||||
From d9ac68c2c5704df3ebde92e0aa2484acf2436d37 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <d9ac68c2c5704df3ebde92e0aa2484acf2436d37.1594918114.git.Jim.Somerville@windriver.com>
|
||||
In-Reply-To: <3c883e04e3cb1a7483280cf43398f22602ac3062.1594918114.git.Jim.Somerville@windriver.com>
|
||||
References: <3c883e04e3cb1a7483280cf43398f22602ac3062.1594918114.git.Jim.Somerville@windriver.com>
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Fri, 22 May 2020 17:22:30 -0400
|
||||
Subject: [PATCH] add BuildRequires elfutils-libelf-devel
|
||||
Subject: [PATCH 2/2] add BuildRequires elfutils-libelf-devel
|
||||
|
||||
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
||||
---
|
||||
SPECS/mlnx-ofa_kernel.spec | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec
|
||||
index 44a31ef..bddd949 100644
|
||||
index 547c6d0..395ca15 100644
|
||||
--- a/SPECS/mlnx-ofa_kernel.spec
|
||||
+++ b/SPECS/mlnx-ofa_kernel.spec
|
||||
@@ -35,6 +35,7 @@
|
||||
|
|
|
@ -1 +1 @@
|
|||
repo:stx/downloads/mlnx-ofa_kernel-4.7-OFED.4.7.3.2.9.1.g457f064.src.rpm
|
||||
repo:stx/downloads/mlnx-ofa_kernel-5.0-OFED.5.0.2.1.8.1.g5f67178.src.rpm
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
|
||||
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
|
||||
PKG_BASE_SRCREV=b23443c0e3fc17fc5b3eb93ede0f979e4c60562a
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
|
||||
|
|
|
@ -1,15 +1,18 @@
|
|||
From 0c0ad51a359b9751910a3229f988ddf37bc489b0 Mon Sep 17 00:00:00 2001
|
||||
From 214e3e515699ae332b3345dc5630a276f19324bf Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com>
|
||||
From: Dahir Osman <dahir.osman@windriver.com>
|
||||
Date: Tue, 14 Jun 2016 14:55:39 -0400
|
||||
Subject: [PATCH 1/3] Add build dependency
|
||||
|
||||
To fix package complaining that libnl is not available
|
||||
|
||||
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
||||
---
|
||||
SPECS/libibverbs.spec | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec
|
||||
index 9b4e0cd..519e421 100644
|
||||
index 8b53e51..673516e 100644
|
||||
--- a/SPECS/libibverbs.spec
|
||||
+++ b/SPECS/libibverbs.spec
|
||||
@@ -22,6 +22,7 @@ Source: http://openfabrics.org/downloads/verbs/libibverbs-%{version}.tar.gz
|
||||
|
@ -21,5 +24,5 @@ index 9b4e0cd..519e421 100644
|
|||
BuildRequires: valgrind-devel
|
||||
%endif
|
||||
--
|
||||
2.7.4
|
||||
1.8.3.1
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
add-build-dependency.patch
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
fix-build-failures-due-to-unwanted-sgid.patch
|
||||
Add-build-dependency.patch
|
||||
upversion-with-release-num.patch
|
||||
fix-build-failures-due-to-unwanted-sgid-bit.patch
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
From dbac2d4a8d9623550f4d063410837b14ab4e4083 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <dbac2d4a8d9623550f4d063410837b14ab4e4083.1594931089.git.Jim.Somerville@windriver.com>
|
||||
In-Reply-To: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com>
|
||||
References: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com>
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Fri, 18 Nov 2016 13:53:47 -0500
|
||||
Subject: [PATCH 3/3] fix build failures due to unwanted sgid bit
|
||||
|
||||
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
||||
---
|
||||
SPECS/libibverbs.spec | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec
|
||||
index 1640a8b..d0c6574 100644
|
||||
--- a/SPECS/libibverbs.spec
|
||||
+++ b/SPECS/libibverbs.spec
|
||||
@@ -111,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%if %{_with_valgrind}
|
||||
%{_libdir}/mlnx_ofed/valgrind/lib*.so
|
||||
%endif
|
||||
+%dir %attr(0755,root,root) %{_includedir}/infiniband
|
||||
%{_includedir}/*
|
||||
%{_mandir}/man3/*
|
||||
%{_mandir}/man7/*
|
||||
--
|
||||
1.8.3.1
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From f6393c8e666fc5e7e58a6f7dbef8e521dc9fc205 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Fri, 18 Nov 2016 13:53:47 -0500
|
||||
Subject: [PATCH 3/3] libibverbs: fix build failures due to unwanted sgid bit
|
||||
|
||||
---
|
||||
SPECS/libibverbs.spec | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec
|
||||
index 4faf18c..83940de 100644
|
||||
--- a/SPECS/libibverbs.spec
|
||||
+++ b/SPECS/libibverbs.spec
|
||||
@@ -111,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%if %{_with_valgrind}
|
||||
%{_libdir}/mlnx_ofed/valgrind/lib*.so
|
||||
%endif
|
||||
+%dir %attr(0755,root,root) %{_includedir}/infiniband
|
||||
%{_includedir}/*
|
||||
%{_mandir}/man3/*
|
||||
%{_mandir}/man7/*
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -1,27 +1,31 @@
|
|||
From bfa58d25ad24537cc798ad207f7e5458cf53877f Mon Sep 17 00:00:00 2001
|
||||
From b5fb1baa8cda84492772493175dd4df2d4b05112 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <b5fb1baa8cda84492772493175dd4df2d4b05112.1594931089.git.Jim.Somerville@windriver.com>
|
||||
In-Reply-To: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com>
|
||||
References: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com>
|
||||
From: eric zhang <eric.zhang@windriver.com>
|
||||
Date: Fri, 5 Jan 2018 21:05:50 -0500
|
||||
Subject: [PATCH 2/3] upversion with release num
|
||||
|
||||
Signed-off-by: eric zhang <eric.zhang@windriver.com>
|
||||
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
|
||||
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
||||
---
|
||||
SPECS/libibverbs.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec
|
||||
index 519e421..4faf18c 100644
|
||||
index 673516e..1640a8b 100644
|
||||
--- a/SPECS/libibverbs.spec
|
||||
+++ b/SPECS/libibverbs.spec
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
Name: libibverbs
|
||||
Version: 41mlnx1
|
||||
-Release: OFED.4.7.0.0.2.47329
|
||||
+Release: OFED.4.7.0.0.2.47329%{?_tis_dist}.%{tis_patch_ver}
|
||||
-Release: OFED.5.0.0.0.9.50218
|
||||
+Release: OFED.5.0.0.0.9.50218%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware
|
||||
|
||||
Group: System Environment/Libraries
|
||||
--
|
||||
2.7.4
|
||||
1.8.3.1
|
||||
|
|
@ -1 +1 @@
|
|||
repo:stx/downloads/libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm
|
||||
repo:stx/downloads/libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
|
||||
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
|
||||
PKG_BASE_SRCREV=b23443c0e3fc17fc5b3eb93ede0f979e4c60562a
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
From 70c67a459f94f65e33e6eaf5ca2120dd2dc8de78 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <70c67a459f94f65e33e6eaf5ca2120dd2dc8de78.1527783193.git.Jim.Somerville@windriver.com>
|
||||
From 42bd893aeeac109d276f5cd85c24fa7e9944650d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <42bd893aeeac109d276f5cd85c24fa7e9944650d.1594934306.git.Jim.Somerville@windriver.com>
|
||||
From: eric zhang <eric.zhang@windriver.com>
|
||||
Date: Wed, 14 Mar 2018 14:56:21 -0400
|
||||
Subject: [PATCH] Add build dependencies and package versioning for TiS format
|
||||
Subject: [PATCH 1/1] Add build dependencies and package versioning for TiS
|
||||
format
|
||||
|
||||
Force disable python3 to avoid random build failure due to go to
|
||||
python3 path.
|
||||
Force disable python3 to avoid random build failures due to
|
||||
using python3 path.
|
||||
|
||||
Signed-off-by: eric zhang <eric.zhang@windriver.com>
|
||||
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
||||
|
@ -15,10 +16,13 @@ Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
|
|||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec
|
||||
index 1f8af03..bd0e7a5 100644
|
||||
index d040b59..b42393f 100644
|
||||
--- a/SPECS/rdma-core.spec
|
||||
+++ b/SPECS/rdma-core.spec
|
||||
@@ -1,3 +1,9 @@
|
||||
@@ -7,6 +7,12 @@
|
||||
%endif
|
||||
%endif
|
||||
|
||||
+%if "%{_tis_build_type}" == "rt"
|
||||
+%define bt_ext -rt
|
||||
+%else
|
||||
|
@ -28,26 +32,26 @@ index 1f8af03..bd0e7a5 100644
|
|||
%{!?cmake: %global cmake cmake}
|
||||
%{!?make_jobs: %global make_jobs make VERBOSE=1 %{?_smp_mflags}}
|
||||
%{!?cmake_install: %global cmake_install DESTDIR=%{buildroot} make install}
|
||||
@@ -15,7 +21,7 @@
|
||||
@@ -35,7 +41,7 @@
|
||||
|
||||
Name: rdma-core
|
||||
Version: 47mlnx1
|
||||
-Release: 1%{?dist}.47329
|
||||
+Release: 1.47329%{?_tis_dist}.%{tis_patch_ver}
|
||||
Version: 50mlnx1
|
||||
-Release: 1%{?dist}.50218
|
||||
+Release: 1.50218%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: RDMA core userspace libraries and daemons
|
||||
Group: System Environment/Libraries
|
||||
|
||||
@@ -62,6 +68,9 @@ BuildRequires: python
|
||||
%if 0%{?fedora} >= 21
|
||||
BuildRequires: perl-generators
|
||||
@@ -91,6 +97,9 @@ BuildRequires: python3
|
||||
BuildRequires: python
|
||||
%endif
|
||||
%endif
|
||||
+BuildRequires: cmake
|
||||
+BuildRequires: libnl3-devel
|
||||
+BuildRequires: mlnx-ofa_kernel%{?bt_ext}-devel
|
||||
|
||||
Requires: dracut, kmod, systemd
|
||||
# Red Hat/Fedora previously shipped redhat/ as a stand-alone
|
||||
@@ -351,10 +360,6 @@ easy, object-oriented access to IB verbs.
|
||||
%if %{with build_docs}
|
||||
%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || %{with_pyverbs}
|
||||
@@ -397,10 +406,6 @@ easy, object-oriented access to IB verbs.
|
||||
-DENABLE_STATIC=1 \
|
||||
%endif
|
||||
%{EXTRA_CMAKE_FLAGS} \
|
||||
|
@ -55,9 +59,9 @@ index 1f8af03..bd0e7a5 100644
|
|||
- -DPYTHON_EXECUTABLE:PATH=%{__python3} \
|
||||
- -DCMAKE_INSTALL_PYTHON_ARCH_LIB:PATH=%{python3_sitearch} \
|
||||
-%endif
|
||||
%if %{with_pyverbs}
|
||||
-DNO_PYVERBS=0
|
||||
%else
|
||||
%if %{with srp_compat}
|
||||
-DENABLE_SRP_COMPAT=1 \
|
||||
%endif
|
||||
--
|
||||
2.7.4
|
||||
1.8.3.1
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
repo:stx/downloads/rdma-core-47mlnx1-1.47329.src.rpm
|
||||
repo:stx/downloads/rdma-core-50mlnx1-1.50218.src.rpm
|
||||
|
|
Loading…
Reference in New Issue