From 9fd08fcd9450e89be8877d348658d3eeb4f9bf05 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Thu, 17 Apr 2025 11:34:56 +0200 Subject: cve-check: extract extending CVE_STATUS to library function The same code for extending CVE_STATUS by CVE_CHECK_IGNORE and CVE_STATUS_GROUPS is used on multiple places. Create a library funtion to have the code on single place and ready for reuse by additional classes. (From OE-Core rev: 45e18f4270d084d81c21b1e5a4a601ce975d8a77) Signed-off-by: Peter Marko Signed-off-by: Richard Purdie --- meta/classes/cve-check.bbclass | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'meta/classes/cve-check.bbclass') diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 555fdaad77..1aef00d297 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -104,21 +104,8 @@ CVE_CHECK_LAYER_INCLUDELIST ??= "" CVE_VERSION_SUFFIX ??= "" python () { - # Fallback all CVEs from CVE_CHECK_IGNORE to CVE_STATUS - cve_check_ignore = d.getVar("CVE_CHECK_IGNORE") - if cve_check_ignore: - bb.warn("CVE_CHECK_IGNORE is deprecated in favor of CVE_STATUS") - for cve in (d.getVar("CVE_CHECK_IGNORE") or "").split(): - d.setVarFlag("CVE_STATUS", cve, "ignored") - - # Process CVE_STATUS_GROUPS to set multiple statuses and optional detail or description at once - for cve_status_group in (d.getVar("CVE_STATUS_GROUPS") or "").split(): - cve_group = d.getVar(cve_status_group) - if cve_group is not None: - for cve in cve_group.split(): - d.setVarFlag("CVE_STATUS", cve, d.getVarFlag(cve_status_group, "status")) - else: - bb.warn("CVE_STATUS_GROUPS contains undefined variable %s" % cve_status_group) + from oe.cve_check import extend_cve_status + extend_cve_status(d) nvd_database_type = d.getVar("NVD_DB_VERSION") if nvd_database_type not in ("NVD1", "NVD2", "FKIE"): -- cgit v1.2.3-54-g00ecf