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

Bphilip/kernel version minor entangle #12180

Open
wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion SPECS/fwctl/fwctl.spec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# SOFTWARE.
#

%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%{!?_name: %define _name fwctl}
%{!?_version: %define _version 24.10}
Expand Down
2 changes: 1 addition & 1 deletion SPECS/iser/iser.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#
#

%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
2 changes: 1 addition & 1 deletion SPECS/isert/isert.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#
#

%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
2 changes: 1 addition & 1 deletion SPECS/knem/knem.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# KMP is disabled by default
%{!?KMP: %global KMP 0}

%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
2 changes: 1 addition & 1 deletion SPECS/mft_kernel/mft_kernel.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
2 changes: 1 addition & 1 deletion SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#
#

%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
2 changes: 1 addition & 1 deletion SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# and/or other materials provided with the distribution.
#
#
%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
2 changes: 1 addition & 1 deletion SPECS/srp/srp.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#
#

%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
2 changes: 1 addition & 1 deletion SPECS/xpmem/xpmem.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%{!?KMP: %global KMP 0}

%global last-known-kernel 6.6.64.2
%global last-known-kernel 6.6.64.2-6

%if 0%{azl}
%global target_kernel_version_full %(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-headers)
Expand Down
5 changes: 4 additions & 1 deletion toolkit/scripts/check_entangled_specs.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,15 @@ def check_oot_kmodules(base_path: str, tag: str, groups: List[FrozenSet]) -> Set

kernel_headers_spec = Spec.from_file(path.join(base_path, "SPECS/kernel-headers/kernel-headers.spec"))
kernel_headers_version = get_tag_value(kernel_headers_spec, 'version')
kernel_headers_release = get_tag_value(kernel_headers_spec, 'release')
kernel_version_release = f"{kernel_headers_version}-{kernel_headers_release}"

for group in groups:
for spec_filename in group:
parsed_spec = Spec.from_file(path.join(base_path, spec_filename))
tag_value = get_tag_value(parsed_spec, tag)
if tag_value != kernel_headers_version:
if tag_value != kernel_version_release:
print(f"kernel version mismatch: {spec_filename} {tag_value} {kernel_version_release}")
err_groups.add(spec_filename)
return err_groups

Expand Down
Loading