Merge remote-tracking branch 'gerrit/master' into f/centos8

Change-Id: Id2143e9e1007e38f262c8b631061e729db83e57d Signed-off-by: Yong Fu <fuyong@neusoft.com>
2020-11-30 16:11:59 +08:00
parent 431badf682 3a4fce5ce6
commit 8e53659c8a
49 changed files with 506 additions and 255 deletions
--- a/centos_extra_downloads.lst
+++ b/centos_extra_downloads.lst
@@ -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
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -4,6 +4,7 @@

 # kernel
 kernel
+kernel-modules-extra
 kernel-tools
 kernel-tools-libs
 perf
@@ -12,6 +13,7 @@ python3-perf
 # kernel-rt
 kernel-rt
 kernel-rt-kvm
+kernel-rt-modules-extra
 kernel-rt-tools

 # e1000e-kmod
@@ -34,6 +36,10 @@ kmod-ixgbevf-rt
 kmod-ixgbe
 kmod-ixgbe-rt

+# igb_uio-kmod
+kmod-igb_uio
+kmod-igb_uio-rt
+
 # drbd-kernel
 kmod-drbd
 kmod-drbd-rt
--- a/1
+++ b/1
@@ -4,6 +4,7 @@ kernel-modules/intel-iavf
 kernel-modules/intel-i40e
 kernel-modules/intel-ixgbevf
 kernel-modules/intel-ixgbe
+kernel-modules/intel-igb_uio
 kernel-modules/qat17
 kernel-modules/drbd
 kernel-modules/intel-opae-fpga
--- a/1
+++ b/1
@@ -5,6 +5,7 @@ kernel-modules/intel-iavf
 kernel-modules/intel-i40e
 kernel-modules/intel-ixgbevf
 kernel-modules/intel-ixgbe
+kernel-modules/intel-igb_uio
 kernel-modules/qat17
 kernel-modules/drbd
 kernel-modules/intel-opae-fpga
--- a/centos_tarball-dl.lst
+++ b/centos_tarball-dl.lst
@@ -1,9 +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.10.19.82.tar.gz#i40e-2.10.19.82#https://sourceforge.net/projects/e1000/files/i40e%20stable/2.10.19.82/i40e-2.10.19.82.tar.gz/download#http##
-iavf-3.7.61.20.tar.gz#iavf-3.7.61.20#https://sourceforge.net/projects/e1000/files/iavf%20stable/3.7.61.20/iavf-3.7.61.20.tar.gz/download#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##
-opae-intel-fpga-driver-2.0.1.tar.gz#opae-intel-fpga-driver-2.0.1#https://github.com/OPAE/opae-sdk/releases/download/1.3.6-4/opae-intel-fpga-driver-2.0.1.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
+!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
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,5 @@
-sphinx>=1.6.2
-openstackdocstheme>=1.26.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0

 # Release Notes documentation
-reno>=0.1.1 # Apache2
+reno>=3.1.0 # Apache-2.0
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -27,12 +27,6 @@ project = u'StarlingX Linux Kernel'
 copyright = u'2020, StarlingX'
 author = u'StarlingX'

-# The short X.Y version
-version = u''
-# The full version, including alpha/beta/rc tags
-release = u'0.1'
-
-
 # -- General configuration ---------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
@@ -58,8 +52,10 @@ source_suffix = '.rst'
 # The master toctree document.
 master_doc = 'index'

-bug_project = '1027'
-bug_tag = 'stx.bug'
+# openstackdocstheme options
+openstackdocs_repo_name = 'starlingx/kernel'
+openstackdocs_use_storyboard = True
+openstackdocs_auto_name = False

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -74,7 +70,7 @@ language = None
 exclude_patterns = []

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'


 # -- Options for HTML output -------------------------------------------------
--- a/kernel-modules/drbd/centos/build_srpm.data
+++ b/kernel-modules/drbd/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST="$FILES_BASE/* \
           $DISTRO/patches/* \
-           $CGCS_BASE/downloads/drbd-8.4.11-1.tar.gz"
-TIS_PATCH_VER=2
+           $STX_BASE/downloads/drbd-8.4.11-1.tar.gz"
+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=4271ab1f4346779e5e1d73ba5f7c27e48d7be12e
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
--- a/kernel-modules/drbd/centos/drbd-kernel.spec
+++ b/kernel-modules/drbd/centos/drbd-kernel.spec
@@ -57,10 +57,6 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(find /lib/modules/%{kversion}/extra/drbd | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
-fi
 echo "Done."
 %preun         -n kmod-drbd%{?bt_ext}
 rpm -ql kmod-drbd%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-drbd%{?bt_ext}-modules
@@ -69,16 +65,11 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(cat /var/run/rpm-kmod-drbd%{?bt_ext}-modules) )
 rm /var/run/rpm-kmod-drbd%{?bt_ext}-modules
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
-fi
 echo "Done."
 %files         -n kmod-drbd%{?bt_ext}
 %defattr(644,root,root,755)
 /lib/modules/%{kversion}/
-%config(noreplace)/etc/depmod.d/drbd.conf
 %doc /usr/share/doc/kmod-drbd-%{version}/


@@ -102,15 +93,12 @@ make -C obj/default %{_smp_mflags} all KDIR=/usr/src/kernels/%{kversion}
 pwd
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} obj/default/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} ChangeLog %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} COPYING %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 mv obj/default/.kernel.config.gz obj/k-config-$kernelrelease.gz
 %{__install} obj/k-config-$kernelrelease.gz %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/

-echo "override drbd * weak-updates" > %{buildroot}%{_sysconfdir}/depmod.d/drbd.conf 
-
 # Strip the modules(s).
 find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \;

--- a/kernel-modules/intel-e1000e/centos/build_srpm.data
+++ b/kernel-modules/intel-e1000e/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
  $PKG_BASE/files/* \
  $STX_BASE/downloads/e1000e-3.6.0.tar.gz"
-TIS_PATCH_VER=1
+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=83ff54f4239c3beeba23f81558fbf0c430233fe2
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
--- a/kernel-modules/intel-e1000e/centos/e1000e-kmod.spec
+++ b/kernel-modules/intel-e1000e/centos/e1000e-kmod.spec
@@ -16,6 +16,7 @@ Summary: %{kmod_name}%{?bt_ext} kernel module(s)
 URL:     http://www.intel.com/

 BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
+BuildRequires: elfutils-libelf-devel
 ExclusiveArch: x86_64

 # Sources.
@@ -43,10 +44,6 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(find /lib/modules/%{kversion}/extra/e1000e | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
-fi
 echo "Done."

 %preun         -n kmod-e1000e%{?bt_ext}
@@ -57,17 +54,12 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(cat /var/run/rpm-kmod-e1000e%{?bt_ext}-modules) )
 rm /var/run/rpm-kmod-e1000e%{?bt_ext}-modules
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
-fi
 echo "Done."

 %files         -n kmod-e1000e%{?bt_ext}
 %defattr(644,root,root,755)
 /lib/modules/%{kversion}/
-%config(noreplace)/etc/depmod.d/kmod-e1000e.conf
 %doc /usr/share/doc/kmod-e1000e-%{version}/
 %doc /usr/share/man/man7/
 %{_sysconfdir}/modules-load.d/e1000e.conf
@@ -83,7 +75,6 @@ of the same variant of the Linux kernel and not on any one specific build.
 %prep
 %autosetup -p 1 -n %{kmod_name}-%{version}
 %{__gzip} %{kmod_name}.7
-echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf

 %build
 pushd src >/dev/null
@@ -93,8 +84,6 @@ popd >/dev/null
 %install
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} src/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
-%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} %{SOURCE5} %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} pci.updates %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
--- a/kernel-modules/intel-i40e/centos/build_srpm.data
+++ b/kernel-modules/intel-i40e/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
  $PKG_BASE/files/* \
-  $STX_BASE/downloads/i40e-2.10.19.82.tar.gz"
-TIS_PATCH_VER=2
+  $STX_BASE/downloads/i40e-2.11.29.tar.gz"
+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]=58597630f681940c2a20cca75dc96c06ae9be15b
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b
+PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
--- a/kernel-modules/intel-i40e/centos/i40e-kmod.spec
+++ b/kernel-modules/intel-i40e/centos/i40e-kmod.spec
@@ -8,7 +8,7 @@
 %define kmod_name i40e

 Name:    %{kmod_name}-kmod%{?bt_ext}
-Version: 2.10.19.82
+Version: 2.11.29
 Release: 0%{?_tis_dist}.%{tis_patch_ver}
 Group:   System Environment/Kernel
 License: GPLv2
@@ -16,6 +16,7 @@ Summary: %{kmod_name}%{?bt_ext} kernel module(s)
 URL:     http://www.intel.com/

 BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
+BuildRequires: elfutils-libelf-devel
 ExclusiveArch: x86_64

 # Sources.
@@ -46,10 +47,6 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(find /lib/modules/%{kversion}/extra/i40e | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
-fi
 echo "Done."

 %preun         -n kmod-i40e%{?bt_ext}
@@ -60,17 +57,12 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(cat /var/run/rpm-kmod-i40e%{?bt_ext}-modules) )
 rm /var/run/rpm-kmod-i40e%{?bt_ext}-modules
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
-fi
 echo "Done."

 %files         -n kmod-i40e%{?bt_ext}
 %defattr(644,root,root,755)
 /lib/modules/%{kversion}/
-%config(noreplace)/etc/depmod.d/kmod-i40e.conf
 %doc /usr/share/doc/kmod-i40e-%{version}/
 %doc /usr/share/man/man7/
 %{_sysconfdir}/modules-load.d/i40e.conf
@@ -86,7 +78,6 @@ of the same variant of the Linux kernel and not on any one specific build.
 %prep
 %autosetup -p 1 -n %{kmod_name}-%{version}
 %{__gzip} %{kmod_name}.7
-echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf

 %build
 pushd src >/dev/null
@@ -96,8 +87,6 @@ popd >/dev/null
 %install
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} src/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
-%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} %{SOURCE5} %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} pci.updates %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
--- a/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch
+++ b/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch
@@ -1,8 +1,11 @@
-From b8c666367cd98a2b0033c043f6f206abd8e238a6 Mon Sep 17 00:00:00 2001
-Message-Id: <b8c666367cd98a2b0033c043f6f206abd8e238a6.1572295393.git.Jim.Somerville@windriver.com>
-From: Vadim Suraev <vsuraev@northforgeinc.com>
-Date: Mon, 8 Feb 2016 15:57:30 -0500
-Subject: [PATCH 1/2] i40e: Enable getting link status from VF
+From bb6e79b7b5231372af923c2961b4898f8ca6e6dc Mon Sep 17 00:00:00 2001
+From: Steven Webster <steven.webster@windriver.com>
+Date: Thu, 25 Jun 2020 11:23:05 -0400
+Subject: [PATCH 1/1] From b8c666367cd98a2b0033c043f6f206abd8e238a6 Mon Sep 17
+ 00:00:00 2001 Message-Id:
+ <b8c666367cd98a2b0033c043f6f206abd8e238a6.1572295393.git.Jim.Somerville@windriver.com>
+ From: Vadim Suraev <vsuraev@northforgeinc.com> Date: Mon, 8 Feb 2016 15:57:30
+ -0500 Subject: [PATCH 1/2] i40e: Enable getting link status from VF

 Add handling of custom OP code sent from the PMD VF to get link status via the
 virtual channel interface.
@@ -10,16 +13,17 @@ virtual channel interface.
 Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
 Signed-off-by: eric zhang <eric.zhang@windriver.com>
 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
+Signed-off-by: Steven Webster <Steven.Webster@windriver.com>
 ---
 src/i40e_virtchnl_pf.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/virtchnl.h         |  1 +
 2 files changed, 79 insertions(+)

 diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
-index 9e48f0d..21b4606 100644
+index 7e19a50..278b5fd 100644
 --- a/src/i40e_virtchnl_pf.c
 +++ b/src/i40e_virtchnl_pf.c
-@@ -2467,6 +2467,81 @@ err_out:
+@@ -2689,6 +2689,81 @@ err_out:
 				       aq_ret);
 }
 
@@ -101,7 +105,7 @@ index 9e48f0d..21b4606 100644
 /**
  * i40e_vc_config_queues_msg
  * @vf: pointer to the VF info
-@@ -4166,6 +4241,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode,
+@@ -4415,6 +4490,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode,
 	case VIRTCHNL_OP_REQUEST_QUEUES:
 		ret = i40e_vc_request_queues_msg(vf, msg);
 		break;
@@ -112,7 +116,7 @@ index 9e48f0d..21b4606 100644
 	case VIRTCHNL_OP_ENABLE_CHANNELS:
 		ret = i40e_vc_add_qch_msg(vf, msg);
 diff --git a/src/virtchnl.h b/src/virtchnl.h
-index a22cc43..d3d9324 100644
+index c1b1ab3..2e84c9b 100644
 --- a/src/virtchnl.h
 +++ b/src/virtchnl.h
@@ -128,6 +128,7 @@ enum virtchnl_ops {
@@ -120,9 +124,9 @@ index a22cc43..d3d9324 100644
 	VIRTCHNL_OP_ADD_CLOUD_FILTER = 32,
 	VIRTCHNL_OP_DEL_CLOUD_FILTER = 33,
 +	VIRTCHNL_OP_GET_LINK_STAT = 0x101,
+ 	/* opcodes 34, 35, 36, 37 and 38 are reserved */
 };
 
- /* These macros are used to generate compilation errors if a structure/union
 -- 
 1.8.3.1

--- a/kernel-modules/intel-iavf/centos/build_srpm.data
+++ b/kernel-modules/intel-iavf/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
  $PKG_BASE/files/* \
-  $STX_BASE/downloads/iavf-3.7.61.20.tar.gz"
-TIS_PATCH_VER=2
+  $STX_BASE/downloads/iavf-3.9.5.tar.gz"
+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]=58597630f681940c2a20cca75dc96c06ae9be15b
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b
+PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
--- a/kernel-modules/intel-iavf/centos/iavf-kmod.spec
+++ b/kernel-modules/intel-iavf/centos/iavf-kmod.spec
@@ -8,14 +8,15 @@
 %define kmod_name iavf

 Name:    %{kmod_name}-kmod%{?bt_ext}
-Version: 3.7.61.20
+Version: 3.9.5
 Release: 0%{?_tis_dist}.%{tis_patch_ver}
 Group:   System Environment/Kernel
 License: GPLv2
 Summary: %{kmod_name} kernel module(s)
 URL:     http://www.intel.com/

-BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl, elfutils-libelf-devel
+BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
+BuildRequires: elfutils-libelf-devel
 ExclusiveArch: x86_64

 # Sources.
@@ -43,10 +44,6 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(find /lib/modules/%{kversion}/extra/iavf | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
-fi
 echo "Done."

 %preun         -n kmod-iavf%{?bt_ext}
@@ -57,17 +54,12 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(cat /var/run/rpm-kmod-iavf%{?bt_ext}-modules) )
 rm /var/run/rpm-kmod-iavf%{?bt_ext}-modules
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
-fi
 echo "Done."

 %files         -n kmod-iavf%{?bt_ext}
 %defattr(644,root,root,755)
 /lib/modules/%{kversion}/
-%config(noreplace)/etc/depmod.d/kmod-iavf.conf
 %doc /usr/share/doc/kmod-iavf-%{version}/
 %doc /usr/share/man/man7/
 %{_sysconfdir}/modules-load.d/iavf.conf
@@ -83,7 +75,6 @@ of the same variant of the Linux kernel and not on any one specific build.
 %prep
 %autosetup -p 1 -n %{kmod_name}-%{version}
 %{__gzip} %{kmod_name}.7
-echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf

 %build
 pushd src >/dev/null
@@ -93,8 +84,6 @@ popd >/dev/null
 %install
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} src/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
-%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} %{SOURCE5} %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} pci.updates %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
--- a/kernel-modules/intel-igb_uio/centos/build_srpm.data
+++ b/kernel-modules/intel-igb_uio/centos/build_srpm.data
@@ -0,0 +1,10 @@
+COPY_LIST=" \
+  $PKG_BASE/files/* \
+  $DISTRO/patches/* \
+  $STX_BASE/downloads/dpdk-20.05.tar.gz"
+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=654d249454a7e5c51c683a6bd453cae2711ade56
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
--- a/kernel-modules/intel-igb_uio/centos/igb_uio-kmod.spec
+++ b/kernel-modules/intel-igb_uio/centos/igb_uio-kmod.spec
@@ -0,0 +1,134 @@
+%if "%{?_tis_build_type}" == "rt"
+%define bt_ext -rt
+%else
+%undefine bt_ext
+%endif
+
+# Define the kmod package name here.
+%define kmod_name igb_uio
+
+Name:    %{kmod_name}-kmod%{?bt_ext}
+Version: 20.05
+Release: 0%{?_tis_dist}.%{tis_patch_ver}
+Group:   System Environment/Kernel
+License: GPLv2
+Summary: %{kmod_name} kernel module(s)
+URL:     http://www.intel.com/
+
+BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
+BuildRequires: elfutils-libelf-devel
+BuildRequires: gcc
+BuildRequires: glibc-headers
+BuildRequires: numactl-devel
+BuildRequires: libmnl-devel
+ExclusiveArch: x86_64
+
+# Get the kernel headers version installed, not based on uname.
+%define KERNEL_VERSION %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')
+%define DPDK_TARGET_MACHINE default
+%define STAGING_KERNEL_DIR /usr/src/kernels/%{KERNEL_VERSION}/
+%define DPDK_EXTRA_CFLAGS "-fPIC -g -msse4.2"
+%define DPDK_TARGET x86_64-native-linuxapp-gcc
+
+%define EXTRA_OEMAKE prefix= \\\
+TARGET_LDFLAGS= \\\
+TARGET_CFLAGS= \\\
+RTE_KERNELDIR=%{STAGING_KERNEL_DIR} \\\
+EXTRA_CFLAGS=%{DPDK_EXTRA_CFLAGS} \\\
+RTE_TARGET=%{DPDK_TARGET} \\\
+GCC_MAJOR_VERSION="%(gcc -dumpversion | cut -f1 -d.)" \\\
+GCC_MINOR_VERSION="%(gcc -dumpversion | cut -f2 -d.)"
+
+# Sources.
+Source0:  dpdk-%{version}.tar.gz
+Patch01: 0001-Use-python3-instead-of-python.patch
+
+%define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')
+
+%package       -n kmod-igb_uio%{?bt_ext}
+Summary:          igb_uio kernel module(s)
+Group:            System Environment/Kernel
+%global _use_internal_dependency_generator 0
+Provides:         kernel-modules >= %{kversion}
+Provides:         igb_uio-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post):   /usr/sbin/depmod
+Requires(postun): /usr/sbin/depmod
+
+%description   -n kmod-igb_uio%{?bt_ext}
+This package provides the igb_uio kernel module(s) built
+for the Linux kernel using the %{_target_cpu} family of processors.
+
+%post          -n kmod-igb_uio%{?bt_ext}
+echo "Working. This may take some time ..."
+if [ -e "/boot/System.map-%{kversion}" ]; then
+    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
+fi
+echo "Done."
+
+%preun         -n kmod-igb_uio%{?bt_ext}
+rpm -ql kmod-igb_uio%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-igb_uio%{?bt_ext}-modules
+
+%postun        -n kmod-igb_uio%{?bt_ext}
+echo "Working. This may take some time ..."
+if [ -e "/boot/System.map-%{kversion}" ]; then
+    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
+fi
+rm /var/run/rpm-kmod-igb_uio%{?bt_ext}-modules
+echo "Done."
+
+%files         -n kmod-igb_uio%{?bt_ext}
+%defattr(644,root,root,755)
+/lib/modules/%{kversion}/
+%doc /usr/share/doc/kmod-igb_uio-%{version}/
+%defattr(755,root,root,755)
+%{_datadir}/starlingx/scripts/dpdk-devbind.py
+%exclude %{_datadir}/starlingx/scripts/*.py[oc]
+
+# Disable the building of the debug package(s).
+%define debug_package %{nil}
+
+%description
+This package provides the %{kmod_name} kernel module(s).
+It is built to depend upon the specific ABI provided by a range of releases
+of the same variant of the Linux kernel and not on any one specific build.
+
+%prep
+%autosetup -p 1 -n dpdk-%{version}
+
+%build
+make T=%{DPDK_TARGET} config
+
+# This line changes default compiler flags from native to proper value
+sed -i 's/"native"/"%{DPDK_TARGET_MACHINE}"/' build/.config
+sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/CONFIG_RTE_EAL_IGB_UIO=y/' build/.config
+
+make %{?_smp_mflags} %{EXTRA_OEMAKE}
+ls build/kmod/
+
+%install
+find . -name *.ko
+%{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
+%{__install} build/kmod/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
+%{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
+%{__install} license/gpl-2.0.txt %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
+%{__install} -d %{buildroot}%{_datadir}/starlingx/scripts
+%{__install} -m755 usertools/dpdk-devbind.py %{buildroot}%{_datadir}/starlingx/scripts/dpdk-devbind.py
+
+# Strip the modules(s).
+find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \;
+
+# Always Sign the modules(s).
+# If the module signing keys are not defined, define them here.
+%{!?privkey: %define privkey /usr/src/kernels/%{kversion}/signing_key.pem}
+%{!?pubkey: %define pubkey /usr/src/kernels/%{kversion}/signing_key.x509}
+for module in $(find %{buildroot} -type f -name \*.ko);
+do /usr/src/kernels/%{kversion}/scripts/sign-file \
+    sha256 %{privkey} %{pubkey} $module;
+done
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%changelog
+* Wed Jun 03 2020 Steven Webster <steven.webster@windriver.com> - 20.05-1
+- Initial RPM package, based on Starlingx iavf-kmod.
--- a/kernel-modules/intel-igb_uio/centos/patches/0001-Use-python3-instead-of-python.patch
+++ b/kernel-modules/intel-igb_uio/centos/patches/0001-Use-python3-instead-of-python.patch
@@ -0,0 +1,23 @@
+From bc372ae6430ee11840f1eab10e05273d04aa7110 Mon Sep 17 00:00:00 2001
+From: Yong Fu <fuyong@neusoft.com>
+Date: Mon, 30 Nov 2020 14:46:06 +0800
+Subject: [PATCH] Use-python3-instead-of-python
+
+Signed-off-by: Yong Fu <fuyong@neusoft.com>
+---
+ usertools/dpdk-devbind.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
+index dc00882..8cafa90 100755
+--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
+#! /usr/bin/env python3
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright(c) 2010-2014 Intel Corporation
+ #
+-- 
+2.17.1
+
--- a/kernel-modules/intel-igb_uio/files/modules-load.conf
+++ b/kernel-modules/intel-igb_uio/files/modules-load.conf
@@ -0,0 +1 @@
+igb-uio
--- a/kernel-modules/intel-ixgbe/centos/build_srpm.data
+++ b/kernel-modules/intel-ixgbe/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
  $PKG_BASE/files/* \
  $STX_BASE/downloads/ixgbe-5.6.5.tar.gz"
-TIS_PATCH_VER=1
+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=04704ebb785074dbb38b65f9d9457b6e8c2a11c6
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
--- a/kernel-modules/intel-ixgbe/centos/ixgbe-kmod.spec
+++ b/kernel-modules/intel-ixgbe/centos/ixgbe-kmod.spec
@@ -16,6 +16,7 @@ Summary: %{kmod_name} kernel module(s)
 URL:     http://www.intel.com/

 BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
+BuildRequires: elfutils-libelf-devel
 ExclusiveArch: x86_64

 # Sources.
@@ -44,10 +45,6 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(find /lib/modules/%{kversion}/extra/ixgbe | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
-fi
 echo "Done."
 %preun         -n kmod-ixgbe%{?bt_ext}
 rpm -ql kmod-ixgbe%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-ixgbe%{?bt_ext}-modules
@@ -56,16 +53,11 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(cat /var/run/rpm-kmod-ixgbe%{?bt_ext}-modules) )
 rm /var/run/rpm-kmod-ixgbe%{?bt_ext}-modules
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
-fi
 echo "Done."
 %files         -n kmod-ixgbe%{?bt_ext}
 %defattr(644,root,root,755)
 /lib/modules/%{kversion}/
-%config(noreplace)/etc/depmod.d/kmod-ixgbe.conf
 %doc /usr/share/doc/kmod-ixgbe-%{version}/
 %doc /usr/share/man/man7/
 %{_sysconfdir}/modules-load.d/ixgbe.conf
@@ -82,7 +74,6 @@ of the same variant of the Linux kernel and not on any one specific build.
 %prep
 %autosetup -p 1 -n %{kmod_name}-%{version}
 %{__gzip} %{kmod_name}.7
-echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf

 %build
 pushd src >/dev/null
@@ -92,8 +83,6 @@ popd >/dev/null
 %install
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} src/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
-%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} %{SOURCE5} %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} pci.updates %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
--- a/kernel-modules/intel-ixgbevf/centos/build_srpm.data
+++ b/kernel-modules/intel-ixgbevf/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
  $PKG_BASE/files/* \
  $STX_BASE/downloads/ixgbevf-4.6.3.tar.gz"
-TIS_PATCH_VER=1
+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=04704ebb785074dbb38b65f9d9457b6e8c2a11c6
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
--- a/kernel-modules/intel-ixgbevf/centos/ixgbevf-kmod.spec
+++ b/kernel-modules/intel-ixgbevf/centos/ixgbevf-kmod.spec
@@ -16,6 +16,7 @@ Summary: %{kmod_name} kernel module(s)
 URL:     http://www.intel.com/

 BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
+BuildRequires: elfutils-libelf-devel
 ExclusiveArch: x86_64

 # Sources.
@@ -42,10 +43,6 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(find /lib/modules/%{kversion}/extra/ixgbevf | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
-fi
 echo "Done."
 %preun         -n kmod-ixgbevf%{?bt_ext}
 rpm -ql kmod-ixgbevf%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-ixgbevf%{?bt_ext}-modules
@@ -54,16 +51,11 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(cat /var/run/rpm-kmod-ixgbevf%{?bt_ext}-modules) )
 rm /var/run/rpm-kmod-ixgbevf%{?bt_ext}-modules
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
-fi
 echo "Done."
 %files         -n kmod-ixgbevf%{?bt_ext}
 %defattr(644,root,root,755)
 /lib/modules/%{kversion}/
-%config(noreplace)/etc/depmod.d/kmod-ixgbevf.conf
 %doc /usr/share/doc/kmod-ixgbevf-%{version}/
 %doc /usr/share/man/man7/
 %{_sysconfdir}/modules-load.d/ixgbevf.conf
@@ -80,7 +72,6 @@ of the same variant of the Linux kernel and not on any one specific build.
 %prep
 %autosetup -p 1 -n %{kmod_name}-%{version}
 %{__gzip} %{kmod_name}.7
-echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf

 %build
 pushd src >/dev/null
@@ -90,8 +81,6 @@ popd >/dev/null
 %install
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} src/%{kmod_name}.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
-%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} %{SOURCE5} %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} pci.updates %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
--- a/kernel-modules/intel-opae-fpga/centos/build_srpm.data
+++ b/kernel-modules/intel-opae-fpga/centos/build_srpm.data
@@ -1,4 +1,9 @@
 COPY_LIST=" \
  $PATCHES_BASE/* \
-  $STX_BASE/downloads/opae-intel-fpga-driver-2.0.1.tar.gz"
-TIS_PATCH_VER=3
+  $STX_BASE/downloads/opae-intel-fpga-driver-2.0.1-8.tar.gz"
+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]=b3b85950aecb5fef6902d4dfcf578b402ec6a69d
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=b3b85950aecb5fef6902d4dfcf578b402ec6a69d
+PKG_BASE_SRCREV=aab4c0a0882fe82985726f45cffc692d1dfe1998
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
--- a/kernel-modules/intel-opae-fpga/centos/fpga-kmod.spec
+++ b/kernel-modules/intel-opae-fpga/centos/fpga-kmod.spec
@@ -7,7 +7,7 @@
 # Define the kmod package name here.
 %define kmod_name opae-intel-fpga-driver
 # If a release doesn't have an iteration number, just use 0
-%define iteration 6
+%define iteration 8

 Name:    %{kmod_name}-kmod%{?bt_ext}
 Version: 2.0.1
@@ -22,7 +22,7 @@ ExclusiveArch: x86_64

 # Sources.
 # The source tarball name may or may not include the iteration number.
-Source0:  %{kmod_name}-%{version}.tar.gz
+Source0:  %{kmod_name}-%{version}-%{iteration}.tar.gz
 Patch01:  Remove-regmap-mmio-as-it-is-built-into-the-kernel.patch
 Patch02:  Fix-compile-error-with-CentOS-8.1-4.18.0-147-kernel.patch
 Patch03:  Fix-wrong-kernel-version.patch
@@ -47,10 +47,6 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(find /lib/modules/%{kversion}/extra/opae-intel-fpga-driver | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
-fi
 echo "Done."

 %preun         -n kmod-opae-fpga-driver%{?bt_ext}
@@ -61,17 +57,12 @@ echo "Working. This may take some time ..."
 if [ -e "/boot/System.map-%{kversion}" ]; then
    /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
 fi
-modules=( $(cat /var/run/rpm-kmod-opae-fpga-driver%{?bt_ext}-modules) )
 rm /var/run/rpm-kmod-opae-fpga-driver%{?bt_ext}-modules
-if [ -x "/sbin/weak-modules" ]; then
-    printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
-fi
 echo "Done."

 %files         -n kmod-opae-fpga-driver%{?bt_ext}
 %defattr(644,root,root,755)
 /lib/modules/%{kversion}/
-%config(noreplace)/etc/depmod.d/kmod-opae-intel-fpga-driver.conf
 %doc /usr/share/doc/kmod-%{kmod_name}-%{version}/

 # Disable the building of the debug package(s).
@@ -83,18 +74,16 @@ It is built to depend upon the specific ABI provided by a range of releases
 of the same variant of the Linux kernel and not on any one specific build.

 %prep
-%autosetup -p 1 -n %{kmod_name}-%{version}
-echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf
+%autosetup -p 1 -n %{kmod_name}-%{version}-%{iteration}

 %build
 %{__make} KERNELDIR=%{_usrsrc}/kernels/%{kversion}

 %install
 %{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} %{_builddir}/%{kmod_name}-%{version}/*.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
-%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
-%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
+%{__install} %{_builddir}/%{kmod_name}-%{version}-%{iteration}/*.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
 %{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
+%{__install} LICENSE %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} COPYING %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/
 %{__install} -d %{buildroot}%{_sysconfdir}/modules-load.d

--- a/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
+++ b/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
@@ -1,3 +1,8 @@
 COPY_LIST="$PKG_BASE/files/modules-load.conf"
-TIS_PATCH_VER=3
+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]=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
--- a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch
+++ b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch
@@ -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
@@ -24,7 +25,7 @@ Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
 1 file changed, 35 insertions(+), 15 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,7 +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)
 
-@@ -43,12 +50,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 +62,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 +70,9 @@
+@@ -76,7 +82,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 +90,17 @@
+@@ -94,11 +102,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 +156,6 @@ EOF)
+@@ -154,7 +168,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 +182,7 @@ Obsoletes: mlnx-en-doc
+@@ -181,7 +194,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 +194,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -193,7 +206,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 +232,12 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -231,13 +244,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 +250,6 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -250,7 +262,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 +280,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -281,7 +292,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 +289,11 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts`
+@@ -290,6 +301,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 +309,6 @@ for flavor in %flavors_to_build; do
+@@ -305,7 +321,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 +317,11 @@ touch ofed-files
+@@ -314,9 +329,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 +372,8 @@ echo "override ${mod_name} * weak-updates/%{_name}${mod_path}" >> %{buildroot}%{
+@@ -367,6 +384,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 +720,7 @@ fi
+@@ -712,6 +731,7 @@ fi
 %config(noreplace) %{_sysconfdir}/depmod.d/zz01-%{_name}-*.conf
 %endif
 %endif
--- a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0002-fix-mlnx-ofa_kernel-devel-dependency-on-python2.patch
+++ b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0002-fix-mlnx-ofa_kernel-devel-dependency-on-python2.patch
@@ -12,7 +12,7 @@ diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec
 index 2fccf4f..7525baa 100644
 --- a/SPECS/mlnx-ofa_kernel.spec
 +++ b/SPECS/mlnx-ofa_kernel.spec
-@@ -100,6 +100,7 @@ Patch01: 0001-neuter-HAVE_IEEE_GETQCN.patch
+@@ -112,6 +112,7 @@ Patch01: 0001-neuter-HAVE_IEEE_GETQCN.patch
 Patch02: 0001-neuter-a-bunch-of-ks-stuff.patch
 Patch03: 0001-neuter-some-stats-output.patch
 Patch04: Disable-use-of-page-pool.patch
@@ -20,7 +20,7 @@ index 2fccf4f..7525baa 100644
 
 BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED}
 Vendor: Mellanox Technologies
-@@ -293,6 +294,7 @@ mkdir obj
+@@ -305,6 +306,7 @@ mkdir obj
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
--- a/kernel-modules/mlnx-ofa_kernel/centos/srpm_path
+++ b/kernel-modules/mlnx-ofa_kernel/centos/srpm_path
@@ -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
--- a/kernel-modules/qat17/centos/build_srpm.data
+++ b/kernel-modules/qat17/centos/build_srpm.data
@@ -2,5 +2,10 @@ COPY_LIST=" \
  $PKG_BASE/files/* \
  $STX_BASE/downloads/qat1.7.l.4.5.0-00034.tar.gz \
 "
-TIS_PATCH_VER=2
+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=3b8696650cb85c558c1b4c6d315c64d57f178527
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
 BUILD_IS_SLOW=3
--- a/kernel-modules/qat17/centos/qat17.spec
+++ b/kernel-modules/qat17/centos/qat17.spec
@@ -38,6 +38,7 @@ Source2: qat_service

 #Patch1: 0001-Install-config-file-for-each-VF.patch
 Patch2: Get-and-report-the-return-code-on-firmware-load-fail.patch
+Patch3: crypto-qat-Silence-smp_processor_id-warning.patch

 %description
 Intel(r) QuickAssist Technology API
@@ -54,6 +55,7 @@ fi

 #%patch1 -p1
 %patch2 -p1
+%patch3 -p1

 %build

--- a/kernel-modules/qat17/files/crypto-qat-Silence-smp_processor_id-warning.patch
+++ b/kernel-modules/qat17/files/crypto-qat-Silence-smp_processor_id-warning.patch
@@ -0,0 +1,70 @@
+From 5d3c6cab1726c79855561327b65a19ab982891e5 Mon Sep 17 00:00:00 2001
+From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
+Date: Tue, 23 Jul 2019 07:24:01 +0000
+Subject: [PATCH] crypto: qat - Silence smp_processor_id() warning
+
+[ commit 1b82feb6c5e1996513d0fb0bbb475417088b4954 upstream ]
+
+It seems that smp_processor_id() is only used for a best-effort
+load-balancing, refer to qat_crypto_get_instance_node(). It's not feasible
+to disable preemption for the duration of the crypto requests. Therefore,
+just silence the warning. This commit is similar to e7a9b05ca4
+("crypto: cavium - Fix smp_processor_id() warnings").
+
+Silences the following splat:
+BUG: using smp_processor_id() in preemptible [00000000] code: cryptomgr_test/2904
+caller is qat_alg_ablkcipher_setkey+0x300/0x4a0 [intel_qat]
+CPU: 1 PID: 2904 Comm: cryptomgr_test Tainted: P           O    4.14.69 #1
+...
+Call Trace:
+ dump_stack+0x5f/0x86
+ check_preemption_disabled+0xd3/0xe0
+ qat_alg_ablkcipher_setkey+0x300/0x4a0 [intel_qat]
+ skcipher_setkey_ablkcipher+0x2b/0x40
+ __test_skcipher+0x1f3/0xb20
+ ? cpumask_next_and+0x26/0x40
+ ? find_busiest_group+0x10e/0x9d0
+ ? preempt_count_add+0x49/0xa0
+ ? try_module_get+0x61/0xf0
+ ? crypto_mod_get+0x15/0x30
+ ? __kmalloc+0x1df/0x1f0
+ ? __crypto_alloc_tfm+0x116/0x180
+ ? crypto_skcipher_init_tfm+0xa6/0x180
+ ? crypto_create_tfm+0x4b/0xf0
+ test_skcipher+0x21/0xa0
+ alg_test_skcipher+0x3f/0xa0
+ alg_test.part.6+0x126/0x2a0
+ ? finish_task_switch+0x21b/0x260
+ ? __schedule+0x1e9/0x800
+ ? __wake_up_common+0x8d/0x140
+ cryptomgr_test+0x40/0x50
+ kthread+0xff/0x130
+ ? cryptomgr_notify+0x540/0x540
+ ? kthread_create_on_node+0x70/0x70
+ ret_from_fork+0x24/0x50
+
+Fixes: ed8ccaef52 ("crypto: qat - Add support for SRIOV")
+Cc: stable@vger.kernel.org
+Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: zhao.shuai <zhaos@neusoft.com>
+---
+ quickassist/qat/drivers/crypto/qat/qat_common/adf_common_drv.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/adf_common_drv.h b/quickassist/qat/drivers/crypto/qat/qat_common/adf_common_drv.h
+index 35f0f44..d0ff355 100644
+--- a/quickassist/qat/drivers/crypto/qat/qat_common/adf_common_drv.h
+++ b/quickassist/qat/drivers/crypto/qat/qat_common/adf_common_drv.h
+@@ -100,7 +100,7 @@ struct service_hndl {
+ 
+ static inline int get_current_node(void)
+ {
+-	return topology_physical_package_id(smp_processor_id());
+	return topology_physical_package_id(raw_smp_processor_id());
+ }
+ 
+ int adf_service_register(struct service_hndl *service);
+-- 
+2.7.4
+
--- a/kernel-rt/centos/build_srpm.data
+++ b/kernel-rt/centos/build_srpm.data
@@ -1,4 +1,5 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=4
+PKG_BASE_SRCREV=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
+TIS_PATCH_VER=PKG_GITREVCOUNT+1
 BUILD_IS_BIG=21
 BUILD_IS_SLOW=16
--- a/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
+++ b/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
@@ -7,13 +7,13 @@ Subject: [PATCH 1/2] Build logic and sources for TiC
 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
 Signed-off-by: Robin Lu <bin1.lu@intel.com>
 Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
-Signed-off-by: Yong Fu <fuyong@neusoft.com>
+Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
 ---
- SPECS/kernel-rt.spec | 85 +++++++++++++++++++++++++++-----------------
- 1 file changed, 52 insertions(+), 33 deletions(-)
+ SPECS/kernel-rt.spec | 85 +++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 51 insertions(+), 34 deletions(-)

 diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
-index f9cfea3..b89db57 100644
+index f9cfea3..9e6de9a 100644
 --- a/SPECS/kernel-rt.spec
 +++ b/SPECS/kernel-rt.spec
@@ -36,9 +36,9 @@ Summary: The Linux kernel
@@ -45,16 +45,7 @@ index f9cfea3..b89db57 100644
 # kernel-headers
 # realtime
 %define with_realtime %{?_without_realtime:   0} %{?!_without_realtime:  1}
-@@ -67,6 +70,8 @@ Summary: The Linux kernel
- %define with_bpftool   %{?_without_bpftool:   0} %{?!_without_bpftool:   1}
- # kernel-debuginfo
- %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
-+# STX: disable debuginfo
-+%define with_debuginfo 0
- # Want to build a the vsdo directories installed
- %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
- # kernel-zfcpdump (s390 specific kernel for zfcpdump)
-@@ -126,10 +131,11 @@ Summary: The Linux kernel
+@@ -126,10 +129,11 @@ Summary: The Linux kernel
 %global rttag .rt24
 # realtimeN
 %global rtbuild .96
@@ -68,7 +59,7 @@ index f9cfea3..b89db57 100644
 %define with_bpftool 0
 %define with_zfcpdump 0
 %define with_kabichk  0
-@@ -357,6 +363,7 @@ BuildRequires: xmlto
+@@ -357,6 +361,7 @@ BuildRequires: xmlto
 %if %{with_perf} || %{with_tools}
 BuildRequires: asciidoc
 %endif
@@ -76,7 +67,7 @@ index f9cfea3..b89db57 100644
 
 Source0: linux-%{rpmversion}-%{pkgrelease}.tar.xz
 
-@@ -417,6 +424,12 @@ Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+@@ -417,6 +422,12 @@ Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
 Source2000: cpupower.service
 Source2001: cpupower.config
 
@@ -89,7 +80,7 @@ index f9cfea3..b89db57 100644
 ## Patches needed for building this package
 
 # END OF PATCH DEFINITIONS
-@@ -915,6 +928,7 @@ ApplyOptionalPatch()
+@@ -915,6 +926,7 @@ ApplyOptionalPatch()
   fi
 }
 
@@ -97,7 +88,7 @@ index f9cfea3..b89db57 100644
 %setup -q -n %{name}-%{rpmversion}-%{pkgrelease} -c
 mv linux-%{rpmversion}-%{pkgrelease} linux-%{KVERREL}
 
-@@ -938,20 +952,6 @@ mv COPYING COPYING-%{version}
+@@ -938,20 +950,6 @@ mv COPYING COPYING-%{version}
 # This Prevents scripts/setlocalversion from mucking with our version numbers.
 touch .scmversion
 
@@ -118,7 +109,7 @@ index f9cfea3..b89db57 100644
 %define make make %{?cross_opts} HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}"
 
 # only deal with configs if we are going to build for the arch
-@@ -965,6 +965,9 @@ cd configs
+@@ -965,6 +963,9 @@ cd configs
 
 # Drop some necessary files from the source dir into the buildroot
 cp $RPM_SOURCE_DIR/kernel-*.config .
@@ -128,7 +119,7 @@ index f9cfea3..b89db57 100644
 cp %{SOURCE41} .
 VERSION=%{version} ./generate_all_configs.sh %{name}
 
-@@ -984,8 +987,20 @@ do
+@@ -984,8 +985,20 @@ do
 done
 %endif
 
@@ -150,7 +141,7 @@ index f9cfea3..b89db57 100644
 
 # end of kernel config
 %endif
-@@ -1092,7 +1107,7 @@ BuildKernel() {
+@@ -1092,7 +1105,7 @@ BuildKernel() {
     fi
     %if %{signkernel}
     # Sign the image if we're using EFI
@@ -159,7 +150,7 @@ index f9cfea3..b89db57 100644
     if [ ! -s vmlinuz.signed ]; then
         echo "pesigning failed"
         exit 1
-@@ -1439,6 +1454,12 @@ BuildKernel() {
+@@ -1439,6 +1452,12 @@ BuildKernel() {
 	# Save the signing keys so we can sign the modules in __modsign_install_post
 	cp certs/signing_key.pem certs/signing_key.pem.sign${Flav}
 	cp certs/signing_key.x509 certs/signing_key.x509.sign${Flav}
@@ -172,7 +163,7 @@ index f9cfea3..b89db57 100644
     fi
 %endif
 
-@@ -1991,7 +2012,7 @@ fi
+@@ -1991,7 +2010,7 @@ fi
 %endif # with_perf
 
 %if %{with_tools}
@@ -181,7 +172,7 @@ index f9cfea3..b89db57 100644
 %defattr(-,root,root)
 %ifarch %{cpupowerarchs}
 %files -n %{name}-tools -f cpupower.lang
-@@ -2087,26 +2108,24 @@ fi
+@@ -2087,26 +2106,24 @@ fi
 %if %{with_realtime}\
 %exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
 %exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt\
@@ -215,7 +206,7 @@ index f9cfea3..b89db57 100644
 %dir /lib/modules\
 %dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
 %dir /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel\
-@@ -2127,7 +2146,6 @@ fi
+@@ -2127,7 +2144,6 @@ fi
 %exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
 %exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt\
 %exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.kvm\
@@ -223,7 +214,7 @@ index f9cfea3..b89db57 100644
 %endif\
 %{expand:%%files %{?3:%{3}-}devel}\
 %defattr(-,root,root)\
-@@ -2157,19 +2175,20 @@ fi
+@@ -2157,19 +2173,20 @@ fi
 /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.kvm\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt/kvmgt.ko*\
--- a/kernel-rt/centos/patches/kernel-rt-4.18.0-x86_64.config.tis_extra
+++ b/kernel-rt/centos/patches/kernel-rt-4.18.0-x86_64.config.tis_extra
@@ -202,7 +202,6 @@ CONFIG_DP83640_PHY=y
 # CONFIG_SENSORS_BH1770 is not set
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_PCH_PHUB is not set
-# CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_CB710_CORE is not set
@@ -975,7 +974,14 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # Needed for opae fpga kernel module
 # # as it turns on hidden option REGMAP_MMIO
 CONFIG_MFD_SYSCON=y
+# Also need the following two options for opae fpga
+CONFIG_SPI_BITBANG=m
+CONFIG_EEPROM_AT24=m
+
 #
 # enable e1000 driver as module same as kernel-std
 CONFIG_E1000=m

+# qdisc for tsn
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
--- a/kernel-std/centos/build_srpm.data
+++ b/kernel-std/centos/build_srpm.data
@@ -1,4 +1,5 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=4
+PKG_BASE_SRCREV=145ff64b9734e5c45cfd8eb837a04e257b4b9581
+TIS_PATCH_VER=PKG_GITREVCOUNT+1
 BUILD_IS_BIG=21
 BUILD_IS_SLOW=16
--- a/kernel-std/centos/patches/kernel-4.18.0-x86_64.config.tis_extra
+++ b/kernel-std/centos/patches/kernel-4.18.0-x86_64.config.tis_extra
@@ -206,7 +206,6 @@ CONFIG_DP83640_PHY=y
 # CONFIG_SENSORS_BH1770 is not set
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_PCH_PHUB is not set
-# CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_CB710_CORE is not set
@@ -831,5 +830,12 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # Needed for opae fpga kernel module
 # as it turns on hidden option REGMAP_MMIO
 CONFIG_MFD_SYSCON=y
+# Also need the following two options for opae fpga
+CONFIG_SPI_BITBANG=m
+CONFIG_EEPROM_AT24=m

 # CONFIG_KASAN is not set
+
+# qdisc for tsn
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -31,8 +31,10 @@ extensions = [
    'reno.sphinxext',
 ]

-bug_project = '1027'
-bug_tag = 'stx.bug'
+# openstackdocstheme options
+openstackdocs_repo_name = 'starlingx/kernel'
+openstackdocs_use_storyboard = True
+openstackdocs_auto_name = False

 # Add any paths that contain templates here, relative to this directory.
 # templates_path = ['_templates']
@@ -82,7 +84,7 @@ exclude_patterns = []
 # show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'

 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -131,10 +133,6 @@ html_theme = 'starlingxdocs'
 # directly to the root of the documentation.
 # html_extra_path = []

-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
--- a/userspace/mellanox/libibverbs/centos/build_srpm.data
+++ b/userspace/mellanox/libibverbs/centos/build_srpm.data
@@ -1 +1,6 @@
-TIS_PATCH_VER=1
+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]=58597630f681940c2a20cca75dc96c06ae9be15b
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b
+PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
--- a/userspace/mellanox/libibverbs/centos/meta_patches/Add-build-dependency.patch
+++ b/userspace/mellanox/libibverbs/centos/meta_patches/Add-build-dependency.patch
@@ -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

--- a/userspace/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER
+++ b/userspace/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER
@@ -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
--- a/userspace/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid-bit.patch
+++ b/userspace/mellanox/libibverbs/centos/meta_patches/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
+
--- a/userspace/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
+++ b/userspace/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
@@ -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
-
--- a/userspace/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ b/userspace/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
@@ -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

--- a/userspace/mellanox/libibverbs/centos/srpm_path
+++ b/userspace/mellanox/libibverbs/centos/srpm_path
@@ -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
--- a/userspace/mellanox/rdma-core/centos/build_srpm.data
+++ b/userspace/mellanox/rdma-core/centos/build_srpm.data
@@ -1 +1,6 @@
-TIS_PATCH_VER=2
+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]=58597630f681940c2a20cca75dc96c06ae9be15b
+BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b
+PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b
+TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT
--- a/userspace/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch
+++ b/userspace/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch
@@ -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, 11 insertions(+), 2 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,31 +32,36 @@ 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
 
-@@ -57,11 +63,14 @@ BuildRequires: python3-devel
- BuildRequires: python3-Cython
+@@ -91,6 +97,9 @@ BuildRequires: python3
+ BuildRequires: python
 %endif
- %else
-BuildRequires: python
-+BuildRequires: python3
- %endif
- %if 0%{?fedora} >= 21
- BuildRequires: perl-generators
 %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
+ %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} \
+-%if %{defined __python3}
+-         -DPYTHON_EXECUTABLE:PATH=%{__python3} \
+-         -DCMAKE_INSTALL_PYTHON_ARCH_LIB:PATH=%{python3_sitearch} \
+-%endif
+ %if %{with srp_compat}
+          -DENABLE_SRP_COMPAT=1 \
+ %endif
 -- 
-2.17.1
+1.8.3.1

--- a/userspace/mellanox/rdma-core/centos/srpm_path
+++ b/userspace/mellanox/rdma-core/centos/srpm_path
@@ -1 +1 @@
-repo:stx/downloads/rdma-core-47mlnx1-1.47329.src.rpm
+repo:stx/downloads/rdma-core-50mlnx1-1.50218.src.rpm