Include release number in kernel version entanglement check

microsoft · Jan 31, 2025 · ae53b46 · ae53b46
1 parent 5a51e46
commit ae53b46
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git 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-4
 
 %{!?_name: %define _name fwctl}
 %{!?_version: %define _version 24.10}

diff --git 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-4
 
 %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
@@ -26,7 +26,7 @@
 #
 #
 
-%global last-known-kernel 6.6.64.2
+%global last-known-kernel 6.6.64.2-4
 
 %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
@@ -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-4
 
 %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
@@ -1,4 +1,4 @@
-%global last-known-kernel 6.6.64.2
+%global last-known-kernel 6.6.64.2-4
 
 %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
@@ -26,7 +26,7 @@
 #
 #
 
-%global last-known-kernel 6.6.64.2
+%global last-known-kernel 6.6.64.2-4
 
 %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
@@ -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-4
 
 %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
@@ -26,7 +26,7 @@
 #
 #
 
-%global last-known-kernel 6.6.64.2
+%global last-known-kernel 6.6.64.2-4
 
 %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
@@ -1,6 +1,6 @@
 %{!?KMP: %global KMP 0}
 
-%global last-known-kernel 6.6.64.2
+%global last-known-kernel 6.6.64.2-4
 
 %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
@@ -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