| Message ID | 20260407-fix-lic-sbom-cve-check-v2-1-f69da412fd67@bootlin.com |
|---|---|
| State | Accepted, archived |
| Commit | 20f7a0447ddfaa6cdf9747086a2e34d53e6da707 |
| Headers | show |
| Series | sbom-cve-check-update-db: Fix various failures | expand |
diff --git a/meta/classes-recipe/sbom-cve-check.bbclass b/meta/classes-recipe/sbom-cve-check.bbclass index 6c62a5119dea..4abc427c58f2 100644 --- a/meta/classes-recipe/sbom-cve-check.bbclass +++ b/meta/classes-recipe/sbom-cve-check.bbclass @@ -106,8 +106,8 @@ do_sbom_cve_check[sstate-inputdirs] = "${SBOM_CVE_CHECK_DEPLOYDIR}" do_sbom_cve_check[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" do_sbom_cve_check[depends] += " \ python3-sbom-cve-check-native:do_populate_sysroot \ - sbom-cve-check-update-cvelist-native:do_unpack \ - sbom-cve-check-update-nvd-native:do_unpack \ + sbom-cve-check-update-cvelist-native:do_patch \ + sbom-cve-check-update-nvd-native:do_patch \ " python do_sbom_cve_check_setscene() { diff --git a/meta/recipes-devtools/sbom-cve-check/sbom-cve-check-update-db.inc b/meta/recipes-devtools/sbom-cve-check/sbom-cve-check-update-db.inc index 4e9cef96e8ea..a318e2c40ea9 100644 --- a/meta/recipes-devtools/sbom-cve-check/sbom-cve-check-update-db.inc +++ b/meta/recipes-devtools/sbom-cve-check/sbom-cve-check-update-db.inc @@ -9,7 +9,6 @@ require sbom-cve-check-config.inc SBOM_CVE_CHECK_DB_NAME[doc] = "Database name, which is the Git repository directory name. \ The git repository will be stored in ${SBOM_CVE_CHECK_DEPLOY_DB_DIR)/" -deltask do_patch deltask do_configure deltask do_compile deltask do_install
The `do_populate_lic` task was failing because it runs after `do_patch`, but the indirect dependency on `do_unpack` was lost when the `do_patch` task was deleted. It is safe, and even preferable, to retain the `do_patch` task, as this allows users to apply patches to their CVE databases. Follow-up to commit 8ef22ad9e302f86b2da4fa81541a464e95b9ef3c ("sbom-cve-check: Add class for post-build CVE analysis"). Signed-off-by: Benjamin Robin <benjamin.robin@bootlin.com> --- meta/classes-recipe/sbom-cve-check.bbclass | 4 ++-- meta/recipes-devtools/sbom-cve-check/sbom-cve-check-update-db.inc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)