Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Identify and Update versions of MOFED dependency SPECS that are present in Azure Linux core #11841

Merged
merged 19 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
95d5a34
ADO 55234284 Identify and Update versions of MOFED dependency SPECS f…
Alberto-Perez-Guevara Jan 9, 2025
17d0cf7
Add ofed-docs
Alberto-Perez-Guevara Jan 9, 2025
b4ffaf0
Update mlnx-tools and ofed-docs
Alberto-Perez-Guevara Jan 9, 2025
ae5a989
Add python-prometheus_client v0.20.0 for HPC image
Alberto-Perez-Guevara Jan 9, 2025
2a669d0
Fix perftest extended release info o
Alberto-Perez-Guevara Jan 9, 2025
0de8451
Fix prometheus_client tar ball name in spec
Alberto-Perez-Guevara Jan 9, 2025
ac53de4
Fix Spec file check reported errors
Alberto-Perez-Guevara Jan 9, 2025
d7ad8d2
Fix License Map check and Spec files check
Alberto-Perez-Guevara Jan 10, 2025
7bce366
Fix file name in signature json file
Alberto-Perez-Guevara Jan 10, 2025
db8e37c
Fix missing bracket in signature json file
Alberto-Perez-Guevara Jan 10, 2025
dfd393e
Update openmpi package for HPC image
Alberto-Perez-Guevara Jan 10, 2025
3124e6d
Update SPECS/mlnx-tools/mlnx-tools.spec
Alberto-Perez-Guevara Jan 11, 2025
3518d56
Update SPECS/ofed-docs/ofed-docs.spec
Alberto-Perez-Guevara Jan 11, 2025
e171cdc
Update SPECS/perftest/perftest.spec
Alberto-Perez-Guevara Jan 11, 2025
77e3355
Update SPECS/ofed-scripts/ofed-scripts.spec
Alberto-Perez-Guevara Jan 11, 2025
856f217
Update SPECS/mlnx-tools/mlnx-tools.spec
Alberto-Perez-Guevara Jan 11, 2025
be2f378
Fix Code Review items regarding license attribution.
Alberto-Perez-Guevara Jan 11, 2025
1134c5a
Fix Code Review include lincese file to be packaged.
Alberto-Perez-Guevara Jan 11, 2025
4c793eb
Update SPECS/ofed-scripts/ofed-scripts.spec
Alberto-Perez-Guevara Jan 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions LICENSES-AND-NOTICES/SPECS/data/licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,7 @@
"python-poetry-core",
"python-process-tests",
"python-productmd",
"python-prometheus_client",
"python-ptyprocess",
"python-pycares",
"python-pycosat",
Expand Down Expand Up @@ -2458,6 +2459,7 @@
"mlnx-tools",
"mlx-bootctl",
"nvidia-container-toolkit",
"ofed-docs",
"ofed-scripts",
"perftest"
]
Expand Down
2 changes: 1 addition & 1 deletion SPECS/mlnx-tools/mlnx-tools.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"mlnx-tools-5.2.0.tar.gz": "dab127335ef7698074a234a0937a261682c48674fe7bbaaefe1ac34ee30d68fb"
"mlnx-tools-24.10.tar.gz": "7459a03eebc0c7f939ff9356dc0bcca4ad64120f957623f03f74523d62ee392d"
}
}
68 changes: 39 additions & 29 deletions SPECS/mlnx-tools/mlnx-tools.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,38 +26,38 @@
#
#

%global MLNX_OFED_VERSION 5.6-1.0.3.3
%global BF_VERSION 3.9.0
%global MLNX_OFED_VERSION 24.10-0.7.0.0

Summary: Mellanox userland tools and scripts
Name: mlnx-tools
Version: 5.2.0
Release: 2%{?dist}
License: CPL 1.0 or BSD or GPLv2
Version: 24.10
Release: 1%{?dist}
License: GPLv2 or BSD
Vendor: Microsoft Corporation
Distribution: Azure Linux
Group: System Environment/Programming
Group: Applications/System
URL: https://github.com/Mellanox/mlnx-tools
Source0: https://linux.mellanox.com/public/repo/bluefield/%{BF_VERSION}/extras/mlnx_ofed/%{MLNX_OFED_VERSION}/SOURCES/%{name}_%{version}.orig.tar.gz#/%{name}-%{version}.tar.gz
Source0: https://linux.mellanox.com/public/repo/mlnx_ofed/%{MLNX_OFED_VERSION}/SRPMS/%{name}-%{version}.tar.gz
Obsoletes: mlnx-ofa_kernel < 5.4
Obsoletes: mlnx_en-utils < 5.4

BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/%{name}}

%description
Mellanox userland tools and scripts

%define debug_package %{nil}
%define __python %{_bindir}/python3
BuildRequires: python3
# mlnx_tune is python2 but is not important enough to create a dependency
# on python2 in a python3 system:
%global __requires_exclude_from mlnx_tune
%global RHEL8 0%{?rhel} >= 8
%global FEDORA3X 0%{?fedora} >= 30
%global SLES15 0%{?suse_version} >= 1500
%global OPENEULER 0%{?openEuler} >= 2
%global PYTHON3 %{RHEL8} || %{FEDORA3X} || %{SLES15} || %{OPENEULER}
%global python_dir %{_datadir}/%{name}/python

%prep
%autosetup -n %{name}-%{version}

%build
%setup -n %{name}-%{version}

%install
rm -rf %{buildroot}

add_env()
{
Expand All @@ -74,37 +74,47 @@ EOF
}

touch mlnx-tools-files
mlnx_python_sitelib=%{python_sitelib}
if [ "$(echo %{_prefix} | sed -e 's@/@@g')" != "usr" ]; then
mlnx_python_sitelib=$(echo %{python_sitelib} | sed -e 's@/usr@%{_prefix}@')
fi
export PKG_VERSION="%{version}"
%make_install PYTHON="%__python" PYTHON_SETUP_EXTRA_ARGS="-O1 --prefix=%{buildroot}%{_prefix} --install-lib=%{buildroot}${mlnx_python_sitelib}"
%make_install
%if %PYTHON3
sed -i -e '1s/python\>/python3/' %{buildroot}/usr/{s,}bin/* \
%{buildroot}%{python_dir}/*.py
%endif

if [ "$(echo %{_prefix} | sed -e 's@/@@g')" != "usr" ]; then
%if "%{_prefix}" != "/usr"
conf_env=/etc/profile.d/mlnx-tools.sh
install -d %{buildroot}/etc/profile.d
add_env %{buildroot}$conf_env PYTHONPATH $mlnx_python_sitelib
add_env %{buildroot}$conf_env PATH %{_bindir}
add_env %{buildroot}$conf_env PATH %{_sbindir}
echo $conf_env >> mlnx-tools-files
fi
find %{buildroot}${mlnx_python_sitelib} -type f -print | sed -e 's@%{buildroot}@@' >> mlnx-tools-files
%endif

%clean
rm -rf %{buildroot}

%if "%{_prefix}" != "/usr"
%files -f mlnx-tools-files
%else
%files
%endif
%license LICENSE
%doc doc/*
%license debian/copyright
%defattr(-,root,root,-)
/sbin/sysctl_perf_tuning
/sbin/mlnx_bf_configure
/sbin/mlnx_bf_configure_ct
/sbin/mlnx-sf
%{_sbindir}/*
%{_bindir}/*
%{_mandir}/man8/ib2ib_setup.8*
%{_mandir}/man8/*.8*
%{python_dir}/dcbnetlink.py*
%{python_dir}/netlink.py*
%exclude %{python_dir}/__pycache__/*.pyc
/lib/udev/mlnx_bf_udev

%changelog
* Thu Jan 09 2025 Alberto David Perez Guevara <[email protected]> 24.10-1
- Upgrade package to version 24.10

* Fri Jul 22 2022 Rachel Menge <[email protected]> 5.2.0-2
- Initial CBL-Mariner import from NVIDIA (license: GPLv2).
- Lint spec to conform to Mariner
Expand All @@ -113,5 +123,5 @@ find %{buildroot}${mlnx_python_sitelib} -type f -print | sed -e 's@%{buildroot}@
* Wed May 12 2021 Tzafrir Cohen <[email protected]> - 5.2.0-1
- MLNX_OFED branch

* Wed Nov 1 2017 Vladimir Sokolovsky <[email protected]> - 4.6.0-1
* Wed Nov 01 2017 Vladimir Sokolovsky <[email protected]> - 4.6.0-1
- Initial packaging
5 changes: 5 additions & 0 deletions SPECS/ofed-docs/ofed-docs.signatures.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Signatures": {
"ofed-docs-24.10.tar.gz": "ca307e3ef7407d9f4386fe021dd3f130d114f793884e60493ae129fdc83f7478"
}
}
75 changes: 75 additions & 0 deletions SPECS/ofed-docs/ofed-docs.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#
# Copyright (c) 2012 Mellanox Technologies. All rights reserved.
#
# This Software is licensed under one of the following licenses:
#
# 1) under the terms of the "Common Public License 1.0" a copy of which is
# available from the Open Source Initiative, see
# http://www.opensource.org/licenses/cpl.php.
#
# 2) under the terms of the "The BSD License" a copy of which is
# available from the Open Source Initiative, see
# http://www.opensource.org/licenses/bsd-license.php.
#
# 3) under the terms of the "GNU General Public License (GPL) Version 2" a
# copy of which is available from the Open Source Initiative, see
# http://www.opensource.org/licenses/gpl-license.php.
#
# Licensee has the right to choose one of the above licenses.
#
# Redistributions of source code must retain the above copyright
# notice and one of the license notices.
#
# Redistributions in binary form must reproduce both the above copyright
# notice, one of the license notices in the documentation
# and/or other materials provided with the distribution.
#
#
# $Id: ofed-docs.spec 7948 2006-06-13 12:42:34Z vlad $
#

%global MLNX_OFED_VERSION 24.10-0.7.0.0
Summary: OFED docs
Name: ofed-docs
Version: 24.10
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://www.openfabrics.org
Source0: https://linux.mellanox.com/public/repo/mlnx_ofed/%{MLNX_OFED_VERSION}/SRPMS/%{name}-%{version}.tar.gz
Group: Documentation/Man

BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/%{name}-%{version}-root}

%description
OpenFabrics documentation

%prep
%setup -q -n %{name}-%{version}

%install
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
cp -a * $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%license LICENSE
%defattr(-,root,root)
Alberto-Perez-Guevara marked this conversation as resolved.
Show resolved Hide resolved
%{_defaultdocdir}/%{name}-%{version}

%changelog
* Wed Jan 08 2025 Alberto David Perez Guevara <[email protected]> 24.10-1
- Initial Azure Linux import from NVIDIA (license: GPLv2).
- License verified.

* Sun Mar 25 2007 Vladimir Sokolovsky <[email protected]>
- Changed prefix

* Thu Jul 27 2006 Vladimir Sokolovsky <[email protected]>
- Changed version to 1.1

* Tue Jun 06 2006 Vladimir Sokolovsky <[email protected]>
- Initial packaging
2 changes: 1 addition & 1 deletion SPECS/ofed-scripts/ofed-scripts.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"ofed-scripts-5.6.tar.gz": "43c4b4feef0101d68774ca6f7780eacd5d888beaf6514b155d7987337f1aa968"
"ofed-scripts-24.10.tar.gz": "c27e6739dd878e8879945e8d15b5d0950a5b80597a21b60e1018bf707e281f20"
}
}
Loading
Loading