From 050aaaa9c6e4998b50a3a1719b35906521e1984a Mon Sep 17 00:00:00 2001 From: Binu Jose Philip Date: Fri, 31 Jan 2025 20:42:58 +0000 Subject: [PATCH] add minor version to kernel entangle check --- SPECS/fwctl/fwctl.spec | 2 +- SPECS/iser/iser.spec | 2 +- SPECS/isert/isert.spec | 2 +- SPECS/knem/knem.spec | 2 +- SPECS/mft_kernel/mft_kernel.spec | 2 +- SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec | 2 +- SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec | 2 +- SPECS/srp/srp.spec | 2 +- SPECS/xpmem/xpmem.spec | 2 +- toolkit/scripts/check_entangled_specs.py | 5 ++++- 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/SPECS/fwctl/fwctl.spec b/SPECS/fwctl/fwctl.spec index 4464b42e8af..bb10d749c5d 100644 --- a/SPECS/fwctl/fwctl.spec +++ b/SPECS/fwctl/fwctl.spec @@ -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} diff --git a/SPECS/iser/iser.spec b/SPECS/iser/iser.spec index c04c346eb18..707f812b9fa 100644 --- a/SPECS/iser/iser.spec +++ b/SPECS/iser/iser.spec @@ -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) diff --git a/SPECS/isert/isert.spec b/SPECS/isert/isert.spec index 8e08b1c4fe5..d9435d210f4 100644 --- a/SPECS/isert/isert.spec +++ b/SPECS/isert/isert.spec @@ -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) diff --git a/SPECS/knem/knem.spec b/SPECS/knem/knem.spec index 56956048877..f224685c86d 100644 --- a/SPECS/knem/knem.spec +++ b/SPECS/knem/knem.spec @@ -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) diff --git a/SPECS/mft_kernel/mft_kernel.spec b/SPECS/mft_kernel/mft_kernel.spec index 196f45cba66..82813286f40 100644 --- a/SPECS/mft_kernel/mft_kernel.spec +++ b/SPECS/mft_kernel/mft_kernel.spec @@ -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) diff --git a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec index b363a673f22..ce67d9967a3 100644 --- a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec +++ b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec @@ -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) diff --git a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec index 7da6afa630d..5450ac68dc0 100644 --- a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec +++ b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec @@ -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) diff --git a/SPECS/srp/srp.spec b/SPECS/srp/srp.spec index fce7deb5160..a35b095c581 100644 --- a/SPECS/srp/srp.spec +++ b/SPECS/srp/srp.spec @@ -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) diff --git a/SPECS/xpmem/xpmem.spec b/SPECS/xpmem/xpmem.spec index 464c31a5cc0..d150e885450 100644 --- a/SPECS/xpmem/xpmem.spec +++ b/SPECS/xpmem/xpmem.spec @@ -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) diff --git a/toolkit/scripts/check_entangled_specs.py b/toolkit/scripts/check_entangled_specs.py index 0f0091b68f5..f3ef7b76385 100755 --- a/toolkit/scripts/check_entangled_specs.py +++ b/toolkit/scripts/check_entangled_specs.py @@ -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