diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
| commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
| tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-security/meta-security-isafw | |
| parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
| parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
| download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz | |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-security/meta-security-isafw')
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-security/meta-security-isafw/classes/isafw.bbclass b/meta-security/meta-security-isafw/classes/isafw.bbclass index 146acdfbf..da6bf7639 100644 --- a/meta-security/meta-security-isafw/classes/isafw.bbclass +++ b/meta-security/meta-security-isafw/classes/isafw.bbclass @@ -41,7 +41,7 @@ python do_analysesource() { recipe.version = recipe.version.split('+git', 1)[0] for p in d.getVar('PACKAGES', True).split(): - license = str(d.getVar('LICENSE_' + p, True)) + license = str(d.getVar('LICENSE:' + p, True)) if license == "None": license = d.getVar('LICENSE', True) license = license.replace("(", "") diff --git a/meta-security/meta-security-isafw/conf/layer.conf b/meta-security/meta-security-isafw/conf/layer.conf index 1f1095f07..86b0d4b1f 100644 --- a/meta-security/meta-security-isafw/conf/layer.conf +++ b/meta-security/meta-security-isafw/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_security-isafw = "1" LAYERDEPENDS_security-isafw = "core" -LAYERSERIES_COMPAT_security-isafw = "hardknott" +LAYERSERIES_COMPAT_security-isafw = "honister" diff --git a/meta-security/meta-security-isafw/recipes-devtools/checksec/checksec_1.5-1.bb b/meta-security/meta-security-isafw/recipes-devtools/checksec/checksec_1.5-1.bb index 247ec763a..74f5d3923 100644 --- a/meta-security/meta-security-isafw/recipes-devtools/checksec/checksec_1.5-1.bb +++ b/meta-security/meta-security-isafw/recipes-devtools/checksec/checksec_1.5-1.bb @@ -20,6 +20,6 @@ do_install() { sed -i 's/\r//' ${D}${bindir}/checksec.sh } -RDEPENDS_${PN} = "bash binutils" +RDEPENDS:${PN} = "bash binutils" BBCLASSEXTEND = "native" |