diff --git a/classes/sca-cvecheck.bbclass b/classes/sca-cvecheck.bbclass index 6e88a2d6aa..76fb5c7601 100644 --- a/classes/sca-cvecheck.bbclass +++ b/classes/sca-cvecheck.bbclass @@ -11,6 +11,7 @@ inherit sca-image-backtrack # override some variables till an upstream fix is available CVE_CHECK_DB_DIR = "${TOPDIR}/downloads/CVE_CHECK" +CVE_CHECK_DB_DIR[vardepsexclude] += "TOPDIR" SCA_RAW_RESULT_FILE[cvecheck] = "json" diff --git a/classes/sca-datamodel.bbclass b/classes/sca-datamodel.bbclass index b962a56515..593667961c 100644 --- a/classes/sca-datamodel.bbclass +++ b/classes/sca-datamodel.bbclass @@ -31,6 +31,7 @@ def sca_datamodel_bbfiles(d): x = x.replace(y, "", 1) res.add(x.lstrip("/")) return sorted(res) +sca_datamodel_bbfiles[vardepsexclude] += "BBINCLUDED BBLAYERS" def sca_get_model_class(d, **kwargs): __SevTrans = sca_severity_transformation(d) @@ -285,6 +286,8 @@ def sca_get_model_class(d, **kwargs): x.AddDescription(d.getVar("STAGING_DATADIR_NATIVE")) return x +sca_get_model_class[vardepsexclude] += "BBLAYERS" + def __sca_model_to_list(d, list): return [x.ToDict() for x in list] diff --git a/classes/sca-global.bbclass b/classes/sca-global.bbclass index 6fab9771fd..1073f4f181 100644 --- a/classes/sca-global.bbclass +++ b/classes/sca-global.bbclass @@ -195,3 +195,6 @@ SCA_HASHEXCLUDE_VARS = "\ SCA_DATAMODEL_STORAGE \ SCA_LAYERDIR \ " + +# some global vardepexcludes +LIC_FILES_CHKSUM[vardepsexclude] += "SCA_LAYERDIR" diff --git a/classes/sca-mypy-core.bbclass b/classes/sca-mypy-core.bbclass index fba214a2d1..1a72df8620 100755 --- a/classes/sca-mypy-core.bbclass +++ b/classes/sca-mypy-core.bbclass @@ -56,6 +56,8 @@ def do_sca_conv_mypy(d): sca_add_model_class_list(d, _findings) return sca_save_model_to_string(d) +do_sca_conv_mypy[vardepsexclude] += "TOPDIR" + python do_sca_mypy_core() { import os import subprocess @@ -76,7 +78,6 @@ python do_sca_mypy_core() { o.write(cmd_output) } -do_sca_mypy_core[vardepsexclude] += "TOPDIR" python do_sca_mypy_core_report() { import os ## Create data model diff --git a/classes/sca-pkgqaenc-shellident.bbclass b/classes/sca-pkgqaenc-shellident.bbclass index 89d9c17f0f..c6c84de53c 100644 --- a/classes/sca-pkgqaenc-shellident.bbclass +++ b/classes/sca-pkgqaenc-shellident.bbclass @@ -51,4 +51,6 @@ def do_sca_pkgqaenc_shelllist(d, package): res += do_sca_pkgqaenc_warning("pkgqaenc.pkgqaenc.missingprodiver", file, "Package {pkg} uses {bin}, but no provider for this file can be found".format( bin=bin, pkg=package)) - return res \ No newline at end of file + return res + +do_sca_pkgqaenc_shelllist[vardepsexclude] += "TOPDIR" diff --git a/classes/sca-semgrep.bbclass b/classes/sca-semgrep.bbclass index 3064e6e34c..82328524f0 100755 --- a/classes/sca-semgrep.bbclass +++ b/classes/sca-semgrep.bbclass @@ -73,6 +73,8 @@ def do_sca_conv_semgrep(d): sca_add_model_class_list(d, _findings) return sca_save_model_to_string(d) +do_sca_conv_semgrep[vardepsexclude] += "TOPDIR" + python do_sca_semgrep() { import os import subprocess diff --git a/classes/sca-vulture-core.bbclass b/classes/sca-vulture-core.bbclass index 6647b62af4..2a452a5091 100755 --- a/classes/sca-vulture-core.bbclass +++ b/classes/sca-vulture-core.bbclass @@ -60,7 +60,8 @@ def do_sca_conv_vulture(d): sca_add_model_class_list(d, _findings) return sca_save_model_to_string(d) -do_sca_vulture_core[vardepsexclude] += "BB_NUMBER_THREADS" +do_sca_conv_vulture[vardepsexclude] += "TOPDIR" + python do_sca_vulture_core() { import os import subprocess diff --git a/recipes-appends/cve-update-db-native.bbappend b/recipes-appends/cve-update-db-native.bbappend index 038bf2c4d4..fcd89039b4 100644 --- a/recipes-appends/cve-update-db-native.bbappend +++ b/recipes-appends/cve-update-db-native.bbappend @@ -7,5 +7,6 @@ inherit cve-check # Note: if you use different settings, please adjust them here # as well CVE_CHECK_DB_DIR ?= "${TOPDIR}/downloads/CVE_CHECK" +CVE_CHECK_DB_DIR[vardepsexclude] = "TOPDIR" CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvdcve_1.1.db" CVE_CHECK_DB_FILE_LOCK ?= "${CVE_CHECK_DB_FILE}.lock"