It's not specially related to cve_check, you could put it in lib/oe/utils.py or something like that perhaps?
Regards //Ernst Den fre 3 juni 2022 kl 10:58 skrev Marta Rybczynska <[email protected]>: > Move the function to a library, it could be useful in other places. > > Signed-off-by: Marta Rybczynska <[email protected]> > --- > meta/classes/cve-check.bbclass | 11 +++-------- > meta/lib/oe/cve_check.py | 10 ++++++++++ > 2 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/meta/classes/cve-check.bbclass > b/meta/classes/cve-check.bbclass > index c5c22c4c51..5eb0622d00 100644 > --- a/meta/classes/cve-check.bbclass > +++ b/meta/classes/cve-check.bbclass > @@ -80,16 +80,10 @@ CVE_CHECK_LAYER_INCLUDELIST ??= "" > # set to "alphabetical" for version using single alphabetical character > as increment release > CVE_VERSION_SUFFIX ??= "" > > -def update_symlinks(target_path, link_path): > - if link_path != target_path and os.path.exists(target_path): > - if os.path.exists(os.path.realpath(link_path)): > - os.remove(link_path) > - os.symlink(os.path.basename(target_path), link_path) > - > def generate_json_report(d, out_path, link_path): > if os.path.exists(d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")): > import json > - from oe.cve_check import cve_check_merge_jsons > + from oe.cve_check import cve_check_merge_jsons, update_symlinks > > bb.note("Generating JSON CVE summary") > index_file = d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH") > @@ -110,6 +104,7 @@ def generate_json_report(d, out_path, link_path): > python cve_save_summary_handler () { > import shutil > import datetime > + from oe.cve_check import update_symlinks > > cve_tmp_file = d.getVar("CVE_CHECK_TMP_FILE") > > @@ -179,7 +174,7 @@ python cve_check_write_rootfs_manifest () { > import shutil > import json > from oe.rootfs import image_list_installed_packages > - from oe.cve_check import cve_check_merge_jsons > + from oe.cve_check import cve_check_merge_jsons, update_symlinks > > if d.getVar("CVE_CHECK_COPY_FILES") == "1": > deploy_file = d.getVar("CVE_CHECK_RECIPE_FILE") > diff --git a/meta/lib/oe/cve_check.py b/meta/lib/oe/cve_check.py > index dc7d2e2826..aa06497727 100644 > --- a/meta/lib/oe/cve_check.py > +++ b/meta/lib/oe/cve_check.py > @@ -163,3 +163,13 @@ def cve_check_merge_jsons(output, data): > return > > output["package"].append(data["package"][0]) > + > +def update_symlinks(target_path, link_path): > + """ > + Update a symbolic link link_path to point to target_path. > + Remove the link and recreate it if exist and is different. > + """ > + if link_path != target_path and os.path.exists(target_path): > + if os.path.exists(os.path.realpath(link_path)): > + os.remove(link_path) > + os.symlink(os.path.basename(target_path), link_path) > -- > 2.33.0 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#166545): https://lists.openembedded.org/g/openembedded-core/message/166545 Mute This Topic: https://lists.openembedded.org/mt/91517492/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
