diff mbox series

[v2,3/7] sbom-cve-check-config.inc: move to meta/conf/

Message ID 20260407210226.2375631-3-ross.burton@arm.com
State New
Headers show
Series [v2,1/7] sbom-cve-check-update-db: Fix do_populate_lic failure | expand

Commit Message

Ross Burton April 7, 2026, 9:02 p.m. UTC
This file is used by classes and recipes, so it's best to put it into
conf/ instead of alongside the recipe.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/classes-recipe/sbom-cve-check.bbclass                      | 2 +-
 .../sbom-cve-check => conf}/sbom-cve-check-config.inc           | 0
 .../sbom-cve-check/sbom-cve-check-update-db.inc                 | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/{recipes-devtools/sbom-cve-check => conf}/sbom-cve-check-config.inc (100%)
diff mbox series

Patch

diff --git a/meta/classes-recipe/sbom-cve-check.bbclass b/meta/classes-recipe/sbom-cve-check.bbclass
index 4abc427c58..0534833ebe 100644
--- a/meta/classes-recipe/sbom-cve-check.bbclass
+++ b/meta/classes-recipe/sbom-cve-check.bbclass
@@ -6,7 +6,7 @@ 
 # Or it is possible to add this line in local.conf:
 # OE_FRAGMENTS += "core/yocto/sbom-cve-check"
 
-require recipes-devtools/sbom-cve-check/sbom-cve-check-config.inc
+require conf/sbom-cve-check-config.inc
 
 SBOM_CVE_CHECK_DEPLOYDIR = "${WORKDIR}/sbom-cve-check/image-deploy"
 
diff --git a/meta/recipes-devtools/sbom-cve-check/sbom-cve-check-config.inc b/meta/conf/sbom-cve-check-config.inc
similarity index 100%
rename from meta/recipes-devtools/sbom-cve-check/sbom-cve-check-config.inc
rename to meta/conf/sbom-cve-check-config.inc
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 7ada67363d..fbdc561e8c 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
@@ -4,7 +4,7 @@  INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
 
 inherit native
-require sbom-cve-check-config.inc
+require conf/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)/"