diff --git a/centos_extra_downloads.lst b/centos_extra_downloads.lst index 1adb34952..36c3079d9 100644 --- a/centos_extra_downloads.lst +++ b/centos_extra_downloads.lst @@ -1,3 +1,3 @@ -mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm -libibverbs-41mlnx1-OFED.4.5.0.1.0.45101.src.rpm -rdma-core-45mlnx1-1.45101.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 diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index ee2ad92d5..18b0d62e5 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -41,7 +41,7 @@ libtpms-0.6.0-4f0d59d.tar.gz#libtpms-0.6.0#https://github.com/stefanberger/libtp lldpd-0.9.0.tar.gz#lldpd-0.9.0#https://media.luffy.cx/files/lldpd/lldpd-0.9.0.tar.gz#http## lua-1fce39c6397056db645718b8f5821571d97869a4.tar.gz#lua#https://api.github.com/repos/ceph/lua/tarball/1fce39c6397056db645718b8f5821571d97869a4#https## !mariadb-10.1.28.tar.gz#mariadb-10.1.28#https://github.com/MariaDB/server/archive/mariadb-10.1.28.tar.gz#http_script##post-dl-script/mariadb.sh -!MLNX_OFED_SRC-4.5-1.0.1.0.tgz#MLNX_OFED_SRC-4.5-1.0.1.0#http://content.mellanox.com/ofed/MLNX_OFED-4.5-1.0.1.0/MLNX_OFED_SRC-4.5-1.0.1.0.tgz#http_script##post-dl-script/MLNX_OFEDqat1.7.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-1.3.0-2.tar.gz#opae-intel-fpga-driver-1.3.0-2#https://github.com/OPAE/opae-sdk/releases/download/1.3.0-2/opae-intel-fpga-driver-1.3.0-2.tar.gz#http## openvswitch-2.11.0.tar.gz#openvswitch-2.11.0#https://github.com/openvswitch/ovs/archive/v2.11.0.tar.gz#http## puppet-boolean-22b726dd78b0a60a224cc7054aebbf28e9306f62.tar.gz#puppet-boolean#https://github.com/voxpupuli/puppet-boolean/tarball/22b726dd78b0a60a224cc7054aebbf28e9306f62#http## diff --git a/kernel/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data b/kernel/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data index f5fec757c..b2fc668ed 100644 --- a/kernel/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data +++ b/kernel/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data @@ -1,3 +1,3 @@ COPY_LIST="$PKG_BASE/files/modules-load.conf" -TIS_PATCH_VER=2 +TIS_PATCH_VER=1 BUILD_IS_SLOW=3 diff --git a/kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch b/kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch index acc8d5e51..4d033a2d5 100644 --- a/kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch +++ b/kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch @@ -1,5 +1,5 @@ -From 6152dc85e1b94ec93a3378f4f77b3b33907aac35 Mon Sep 17 00:00:00 2001 -Message-Id: <6152dc85e1b94ec93a3378f4f77b3b33907aac35.1579886617.git.Jim.Somerville@windriver.com> +From ddb4a37a859259d13945fc18b59045cffb51f93c Mon Sep 17 00:00:00 2001 +Message-Id: From: Jim Somerville Date: Mon, 20 Jan 2020 11:40:06 -0500 Subject: [PATCH 1/1] Support TiS system @@ -23,7 +23,7 @@ Signed-off-by: Jim Somerville 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec -index 85af93f..6e77d09 100644 +index efe2abc..619e470 100644 --- a/SPECS/mlnx-ofa_kernel.spec +++ b/SPECS/mlnx-ofa_kernel.spec @@ -27,8 +27,14 @@ @@ -42,9 +42,9 @@ index 85af93f..6e77d09 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} -@@ -41,12 +47,11 @@ - %global BLUENIX %(if (grep -qiE "Bluenix" /etc/issue /etc/*release* 2>/dev/null); then echo -n '1'; else echo -n '0'; fi) - %global XENSERVER65 %(if (grep -qiE "XenServer.*6\.5" /etc/issue /etc/*release* 2>/dev/null); 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 +57,7 @@ index 85af93f..6e77d09 100644 # Select packages to build # Kernel module packages to be included into kernel-ib -@@ -63,7 +68,9 @@ +@@ -76,7 +81,9 @@ %{!?KERNEL_SOURCES: %global KERNEL_SOURCES /lib/modules/%{KVERSION}/source} @@ -65,10 +65,10 @@ index 85af93f..6e77d09 100644 + +%define _basename mlnx-ofa_kernel +%define _name %{_basename}%{?bt_ext} - %{!?_version: %global _version 4.5} - %{!?_release: %global _release OFED.4.5.1.0.1.1.gb4fdfac} + %{!?_version: %global _version 5.0} + %{!?_release: %global _release OFED.5.0.2.1.8.1.g5f67178} %global _kmp_rel %{_release}%{?_kmp_build_num}%{?_dist} -@@ -75,11 +82,17 @@ +@@ -94,11 +101,17 @@ Summary: Infiniband HCA Driver Name: %{_name} Version: %{_version} @@ -88,7 +88,7 @@ index 85af93f..6e77d09 100644 BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED} Vendor: Mellanox Technologies Obsoletes: kernel-ib -@@ -135,7 +148,6 @@ EOF) +@@ -154,7 +167,6 @@ EOF) %global kernel_release() %{KVERSION} %global flavors_to_build default %package -n %{non_kmp_pname} @@ -96,7 +96,7 @@ index 85af93f..6e77d09 100644 Requires: coreutils Requires: pciutils Requires: grep -@@ -162,7 +174,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 +105,7 @@ index 85af93f..6e77d09 100644 Summary: Infiniband Driver and ULPs kernel modules Group: System Environment/Libraries %description -n %{non_kmp_pname} -@@ -174,7 +186,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 +114,7 @@ index 85af93f..6e77d09 100644 Obsoletes: kernel-ib-devel Obsoletes: compat-rdma-devel Obsoletes: kernel-ib -@@ -212,13 +224,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 +129,7 @@ index 85af93f..6e77d09 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 -@@ -231,7 +242,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 +137,7 @@ index 85af93f..6e77d09 100644 # %if "%{_vendor}" == "suse" %debug_package -@@ -262,12 +272,17 @@ 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,6 +146,8 @@ index 85af93f..6e77d09 100644 set -- * mkdir source mv "$@" source/ +@@ -290,6 +300,11 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts` + %endif mkdir obj +%patch01 -p1 @@ -156,7 +158,7 @@ index 85af93f..6e77d09 100644 %build export EXTRA_CFLAGS='-DVERSION=\"%version\"' export INSTALL_MOD_DIR=%{install_mod_dir} -@@ -282,7 +297,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 @@ -164,7 +166,7 @@ index 85af93f..6e77d09 100644 cd - done -@@ -291,9 +305,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} @@ -174,10 +176,10 @@ index 85af93f..6e77d09 100644 export PREFIX=%{_prefix} +export MODULE_SIGN_PRIV_KEY=/usr/src/kernels/%{KVERSION}/signing_key.priv +export MODULE_SIGN_PUB_KEY=/usr/src/kernels/%{KVERSION}/signing_key.x509 + %{mlnx_python_env} for flavor in %flavors_to_build; do export KSRC=%{kernel_source $flavor} - export KVERSION=%{kernel_release $KSRC} -@@ -343,6 +359,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 @@ -186,7 +188,7 @@ index 85af93f..6e77d09 100644 %endif # copy sources -@@ -686,6 +704,7 @@ fi +@@ -712,6 +730,7 @@ fi %config(noreplace) %{_sysconfdir}/depmod.d/zz01-%{_name}-*.conf %endif %endif diff --git a/kernel/kernel-modules/mlnx-ofa_kernel/centos/srpm_path b/kernel/kernel-modules/mlnx-ofa_kernel/centos/srpm_path index 8a880eb54..8fbae12b8 100644 --- a/kernel/kernel-modules/mlnx-ofa_kernel/centos/srpm_path +++ b/kernel/kernel-modules/mlnx-ofa_kernel/centos/srpm_path @@ -1 +1 @@ -repo:stx/downloads/mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm +repo:stx/downloads/mlnx-ofa_kernel-5.0-OFED.5.0.2.1.8.1.g5f67178.src.rpm diff --git a/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 67a1762b3..e46666278 100644 --- a/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,23 +1,25 @@ -From 929b465ceb0710134a562ab593c2a1e4a2ce5df7 Mon Sep 17 00:00:00 2001 +From ebc0ab6d19290438c444058b08e56794fdb5bfb4 Mon Sep 17 00:00:00 2001 +Message-Id: From: eric zhang Date: Fri, 5 Jan 2018 21:05:50 -0500 -Subject: [PATCH 1/3] upversion with release num +Subject: [PATCH 1/2] Update package versioning for TIS format Signed-off-by: eric zhang +Signed-off-by: Jim Somerville --- SPECS/libibverbs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -index e55433c..74cb4d2 100644 +index 673516e..1640a8b 100644 --- a/SPECS/libibverbs.spec +++ b/SPECS/libibverbs.spec @@ -12,7 +12,7 @@ Name: libibverbs Version: 41mlnx1 --Release: OFED.4.5.0.1.0.45101 -+Release: OFED.4.5.0.1.0.45101%{?_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 diff --git a/networking/mellanox/libibverbs/centos/srpm_path b/networking/mellanox/libibverbs/centos/srpm_path index 79c1f1b3c..a9d3fd450 100644 --- a/networking/mellanox/libibverbs/centos/srpm_path +++ b/networking/mellanox/libibverbs/centos/srpm_path @@ -1 +1 @@ -repo:stx/downloads/libibverbs-41mlnx1-OFED.4.5.0.1.0.45101.src.rpm +repo:stx/downloads/libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm diff --git a/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch b/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch index 3272f3187..99c54f6e1 100644 --- a/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch +++ b/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch @@ -1,5 +1,5 @@ -From 70c67a459f94f65e33e6eaf5ca2120dd2dc8de78 Mon Sep 17 00:00:00 2001 -Message-Id: <70c67a459f94f65e33e6eaf5ca2120dd2dc8de78.1527783193.git.Jim.Somerville@windriver.com> +From b194e15e5ac26ff762b1c0eb4b3bbca3b618854c Mon Sep 17 00:00:00 2001 +Message-Id: From: eric zhang Date: Wed, 14 Mar 2018 14:56:21 -0400 Subject: [PATCH 1/1] Add build dependencies and package versioning for TiS @@ -12,10 +12,13 @@ Signed-off-by: Jim Somerville 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec -index 7f9cd5b..6d81a28 100644 +index d040b59..e95d9fc 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 @@ -23,21 +26,21 @@ index 7f9cd5b..6d81a28 100644 +%endif + %{!?cmake: %global cmake cmake} - %{!?_udevrulesdir: %global _udevrulesdir /etc/udev/rules.d} - -@@ -8,7 +14,7 @@ + %{!?make_jobs: %global make_jobs make VERBOSE=1 %{?_smp_mflags}} + %{!?cmake_install: %global cmake_install DESTDIR=%{buildroot} make install} +@@ -35,7 +41,7 @@ Name: rdma-core - Version: 45mlnx1 --Release: 1%{?dist}.45101 -+Release: 1.45101%{?_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 -@@ -26,7 +32,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - BuildRequires: binutils - BuildRequires: gcc - BuildRequires: python +@@ -103,7 +109,9 @@ BuildRequires: python-docutils + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 + BuildRequires: perl-generators + %endif - +BuildRequires: cmake +BuildRequires: libnl3-devel diff --git a/networking/mellanox/rdma-core/centos/meta_patches/Hardcode-the-python-executable-to-be-python-2.patch b/networking/mellanox/rdma-core/centos/meta_patches/Hardcode-the-python-executable-to-be-python-2.patch new file mode 100644 index 000000000..19ee99b72 --- /dev/null +++ b/networking/mellanox/rdma-core/centos/meta_patches/Hardcode-the-python-executable-to-be-python-2.patch @@ -0,0 +1,32 @@ +From 72aa6f72693b4483aa1145a68c1235f0ca29ebbc Mon Sep 17 00:00:00 2001 +Message-Id: <72aa6f72693b4483aa1145a68c1235f0ca29ebbc.1588025676.git.Jim.Somerville@windriver.com> +From: Jim Somerville +Date: Mon, 27 Apr 2020 16:58:23 -0400 +Subject: [PATCH 1/1] Hardcode the python executable to be python 2 + +The build messes up trying to use python 3 otherwise. + +Signed-off-by: Jim Somerville +--- + SPECS/rdma-core.spec | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec +index e95d9fc..2f3db49 100644 +--- a/SPECS/rdma-core.spec ++++ b/SPECS/rdma-core.spec +@@ -405,10 +405,7 @@ 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 ++ -DPYTHON_EXECUTABLE:PATH=/usr/bin/python \ + %if %{with srp_compat} + -DENABLE_SRP_COMPAT=1 \ + %endif +-- +1.8.3.1 + diff --git a/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER b/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER index 1b04e9d9b..a444b0f4d 100644 --- a/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER +++ b/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER @@ -1 +1,2 @@ 0001-Add-build-dependencies-and-package-versioning-for-Ti.patch +Hardcode-the-python-executable-to-be-python-2.patch diff --git a/networking/mellanox/rdma-core/centos/srpm_path b/networking/mellanox/rdma-core/centos/srpm_path index be3cdf818..6beeb9327 100644 --- a/networking/mellanox/rdma-core/centos/srpm_path +++ b/networking/mellanox/rdma-core/centos/srpm_path @@ -1 +1 @@ -repo:stx/downloads/rdma-core-45mlnx1-1.45101.src.rpm +repo:stx/downloads/rdma-core-50mlnx1-1.50218.src.rpm