| Message ID | 20250114153748.2358116-1-niko.mauno@vaisala.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] vex.bbclass: Drop redundant import update_symlinks | expand |
I have submitted this particular commit as v2: https://lists.openembedded.org/g/openembedded-core/message/211391 as it fixes an issue that, according to my understanding, prevents using the bbclass in fashion that is compliant with Yocto reference manual. -Niko On 14.1.2025 17.37, Niko Mauno via lists.openembedded.org wrote: > Allow the method to work also when the user has overridden > IMAGE_LINK_NAME value as empty string. > > Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> > --- > meta/classes/cve-check.bbclass | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass > index 9f0a08becd..53f6a94b63 100644 > --- a/meta/classes/cve-check.bbclass > +++ b/meta/classes/cve-check.bbclass > @@ -252,13 +252,15 @@ python cve_check_write_rootfs_manifest () { > > if enable_json: > manifest_name_suffix = d.getVar("CVE_CHECK_MANIFEST_JSON_SUFFIX") > - link_path = os.path.join(deploy_dir, "%s.%s" % (link_name, manifest_name_suffix)) > manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") > > with open(manifest_name, "w") as f: > json.dump(json_data, f, indent=2) > > - update_symlinks(manifest_name, link_path) > + if link_name: > + link_path = os.path.join(deploy_dir, "%s.%s" % (link_name, manifest_name_suffix)) > + update_symlinks(manifest_name, link_path) > + > bb.plain("Image CVE JSON report stored in: %s" % manifest_name) > } > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#209802): https://lists.openembedded.org/g/openembedded-core/message/209802 > Mute This Topic: https://lists.openembedded.org/mt/110609360/3618471 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [niko.mauno@vaisala.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/classes/vex.bbclass b/meta/classes/vex.bbclass index 01d4e52051..c9749d4ceb 100644 --- a/meta/classes/vex.bbclass +++ b/meta/classes/vex.bbclass @@ -119,7 +119,6 @@ def generate_json_report(d, out_path, link_path): python vex_save_summary_handler () { import shutil import datetime - from oe.cve_check import update_symlinks cvelogpath = d.getVar("CVE_CHECK_SUMMARY_DIR")
Remove import from context where it is never used. Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> --- meta/classes/vex.bbclass | 1 - 1 file changed, 1 deletion(-)