Skip to content

OOT Modules -> Add kernel version and release nb into release nb #13645

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

Merged
merged 14 commits into from
May 29, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
fix remaining merge issue
  • Loading branch information
CBL-Mariner-Bot committed May 29, 2025
commit 271fccb4a457f615f40bac00f6df6b82133d0989
Original file line number Diff line number Diff line change
@@ -45,11 +45,7 @@
Summary: Infiniband HCA Driver
Name: %{_name}-signed
Version: 24.10
<<<<<<< HEAD
Release: 19%{?dist}
=======
Release: 17%{release_suffix}%{?dist}
>>>>>>> 9b3a4cb81 (dev work)
Release: 20%{release_suffix}%{?dist}
License: GPLv2
Url: http://www.mellanox.com/
Group: System Environment/Base
@@ -196,7 +192,9 @@ fi
%license %{_datadir}/licenses/%{_name}/copyright

%changelog
<<<<<<< HEAD
* Thu May 29 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 24.10-20
- Add kernel version and release nb into release nb

* Fri May 23 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 24.10-19
- Bump release to rebuild for new kernel release

@@ -205,10 +203,6 @@ fi

* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-17
- Bump release to rebuild for new kernel release
=======
* Mon Apr 30 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 24.10-17
- Add kernel version and release nb into release nb
>>>>>>> 9b3a4cb81 (dev work)

* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 24.10-16
- Bump release to rebuild for new kernel release
14 changes: 4 additions & 10 deletions SPECS-SIGNED/srp-signed/srp-signed.spec
Original file line number Diff line number Diff line change
@@ -47,11 +47,7 @@
Summary: srp driver
Name: %{_name}-signed
Version: 24.10
<<<<<<< HEAD
Release: 19%{?dist}
=======
Release: 17%{release_suffix}%{?dist}
>>>>>>> 9b3a4cb81 (dev work)
Release: 20%{release_suffix}%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
@@ -114,7 +110,9 @@ popd
%license %{_datadir}/licenses/%{_name}/copyright

%changelog
<<<<<<< HEAD
* Thu May 29 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 24.10-20
- Add kernel version and release nb into release nb

* Fri May 23 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 24.10-19
- Bump release to rebuild for new kernel release

@@ -123,10 +121,6 @@ popd

* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-17
- Bump release to rebuild for new kernel release
=======
* Mon Apr 30 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 24.10-17
- Add kernel version and release nb into release nb
>>>>>>> 9b3a4cb81 (dev work)

* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 24.10-16
- Bump release to rebuild for new kernel release
14 changes: 4 additions & 10 deletions SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec
Original file line number Diff line number Diff line change
@@ -20,11 +20,7 @@
Summary: Cross-partition memory
Name: %{_name}-signed
Version: 2.7.4
<<<<<<< HEAD
Release: 19%{?dist}
=======
Release: 17%{release_suffix}%{?dist}
>>>>>>> 9b3a4cb81 (dev work)
Release: 20%{release_suffix}%{?dist}
License: GPLv2 and LGPLv2.1
Group: System Environment/Libraries
Vendor: Microsoft Corporation
@@ -89,7 +85,9 @@ popd


%changelog
<<<<<<< HEAD
* Thu May 29 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 2.7.4-20
- Add kernel version and release nb into release nb

* Fri May 23 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.7.4-19
- Bump release to rebuild for new kernel release

@@ -98,10 +96,6 @@ popd

* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 2.7.4-17
- Bump release to rebuild for new kernel release
=======
* Mon Apr 30 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 2.7.4-17
- Add kernel version and release nb into release nb
>>>>>>> 9b3a4cb81 (dev work)

* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 2.7.4-16
- Bump release to rebuild for new kernel release
19 changes: 4 additions & 15 deletions SPECS/srp/srp.spec
Original file line number Diff line number Diff line change
@@ -26,11 +26,6 @@
#
#

<<<<<<< HEAD
%global last-known-kernel 6.6.90.1-1

=======
>>>>>>> 9b3a4cb81 (dev work)
%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
Copy link
Preview

Copilot AI May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider refactoring the repeated kernel version extraction macros (including target_kernel_version_full, target_azl_build_kernel_version, target_kernel_release, and release_suffix) into a common include file to reduce duplication across the SPEC files and ease future maintenance.

Copilot uses AI. Check for mistakes.

%global target_azl_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
@@ -71,11 +66,7 @@
Summary: srp driver
Name: srp
Version: 24.10
<<<<<<< HEAD
Release: 19%{?dist}
=======
Release: 17%{release_suffix}%{?dist}
>>>>>>> 9b3a4cb81 (dev work)
Release: 20%{release_suffix}%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
@@ -264,7 +255,9 @@ fi
%endif

%changelog
<<<<<<< HEAD
* Thu May 29 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 24.10-20
- Add kernel version and release nb into release nb

* Fri May 23 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 24.10-19
- Bump release to rebuild for new kernel release

@@ -273,10 +266,6 @@ fi

* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 24.10-17
- Bump release to rebuild for new kernel release
=======
* Mon Apr 30 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 24.10-17
- Add kernel version and release nb into release nb
>>>>>>> 9b3a4cb81 (dev work)

* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 24.10-16
- Bump release to rebuild for new kernel release
19 changes: 4 additions & 15 deletions SPECS/xpmem/xpmem.spec
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
%{!?KMP: %global KMP 0}

<<<<<<< HEAD
%global last-known-kernel 6.6.90.1-1

=======
>>>>>>> 9b3a4cb81 (dev work)
%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}' $(/bin/rpm -q --whatprovides kernel-headers))
%global target_azl_build_kernel_version %(/bin/rpm -q --queryformat '%{RPMTAG_VERSION}' $(/bin/rpm -q --whatprovides kernel-headers))
@@ -47,11 +42,7 @@
Summary: Cross-partition memory
Name: xpmem
Version: 2.7.4
<<<<<<< HEAD
Release: 19%{?dist}
=======
Release: 17%{release_suffix}%{?dist}
>>>>>>> 9b3a4cb81 (dev work)
Release: 20%{release_suffix}%{?dist}
License: GPLv2 and LGPLv2.1
Group: System Environment/Libraries
Vendor: Microsoft Corporation
@@ -258,7 +249,9 @@ fi
%endif

%changelog
<<<<<<< HEAD
* Thu May 29 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 2.7.4-20
- Add kernel version and release nb into release nb

* Fri May 23 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.7.4-19
- Bump release to rebuild for new kernel release

@@ -267,10 +260,6 @@ fi

* Tue Apr 29 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 2.7.4-17
- Bump release to rebuild for new kernel release
=======
* Mon Apr 30 2025 Nicolas Guibourge <nicolasg@microsoft.com> - 2.7.4-17
- Add kernel version and release nb into release nb
>>>>>>> 9b3a4cb81 (dev work)

* Fri Apr 25 2025 Chris Co <chrco@microsoft.com> - 2.7.4-16
- Bump release to rebuild for new kernel release
Loading
Oops, something went wrong.