Merge ~sbeattie/ubuntu-cve-tracker/+git/ubuntu-cve-tracker:fix_kernel_abi_breakage_check into ubuntu-cve-tracker:master

[Steve Beattie]

kernel_lib: fix kernel_abi_check for noble kernel meta packages

The kernel team changed the version format for their meta packages with
the noble release, from:

  UPSTREAM_VERSION.ABI.BUILD_REV

to:

  UPSTREAM_VERSION-ABI.BUILD_REV

which matches the base kernel package version scheme. However, our
tool for ensuring that the currently published meta package ABI in
the archive matches the base kernel's ABI was not expecting this
change in behavior, so it would compute the ABI version incorrectly,
leading to failures like:

  FAIL: ABI mismatch in noble-updates: 5 != 1005 (linux-meta-raspi 6.8.0-1005.5 vs linux-raspi 6.8.0-1005.5)

where it should have computed the ABI as 1005.

Added testcases as well.

[Rodrigo Figueiredo Zaiden (rodrigo-zaiden)]

LGTM. Thanks!

review: Approve

diff --git a/scripts/kernel_lib.py b/scripts/kernel_lib.py
index 95de00b..4d6b76c 100755
--- a/scripts/kernel_lib.py
+++ b/scripts/kernel_lib.py
@@ -1542,6 +1542,10 @@ def kernel_package_version(version):
 
 # return the kernel abi from a kernel meta-package version
 # e.g. 4.15.0.45.57 => 45
-# XXX may need to add an offset exception to the kernel table
+# noble meta packages changed their versioning scheme to match the
+# main kernel package abi scheme UPSTREAM_VERSION-ABI.BUILD
 def kernel_meta_abi(version, offset=3):
-    return int(version.split('.').pop(offset))
+    if '-' in version:
+        return kernel_package_abi(version)
+    else:
+        return int(version.split('.').pop(offset))
diff --git a/scripts/test_kernel_lib.py b/scripts/test_kernel_lib.py
index 1bb35c5..f11bee7 100755
--- a/scripts/test_kernel_lib.py
+++ b/scripts/test_kernel_lib.py
@@ -27,6 +27,14 @@ class TestKernelMabiCalc:
     def test_hwe_version(self):
         assert kernel_meta_abi("5.4.0.40.44~18.04.32") == 40
 
+    # noble kernel meta package versions were changed to match the
+    # primary package versioning scheme UPSTREAM_VERSION-ABI.BUILD
+    def test_noble_newer_version(self):
+        assert kernel_meta_abi("6.8.0-14.15") == 14
+
+    def test_noble_newer_derieved_version(self):
+        assert kernel_meta_abi("6.8.0-1014.15") == 1014
+
 
 class TestKernelVersionCalc:
     def test_basic_version(self):