[meta-security-isafw] meta-security-isafw: Fixes to work with oe-core master

Message ID 20220303163919.3345090-1-akshay.bhat@timesys.com
State Under Review
Delegated to: Armin Kuster
Headers show
Series [meta-security-isafw] meta-security-isafw: Fixes to work with oe-core master | expand

Commit Message

Akshay Bhat March 3, 2022, 4:39 p.m. UTC
Update isafw bbclass to build with oe-core master
- prelink support was dropped in oe-core as part of 23c0be78106f
- do_populate_cve_db was renamed to do_fetch in oe-core as part
of f5f97d33a1703d

Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com>
---
 meta-security-isafw/classes/isafw.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/meta-security-isafw/classes/isafw.bbclass b/meta-security-isafw/classes/isafw.bbclass
index da6bf76..3854c0f 100644
--- a/meta-security-isafw/classes/isafw.bbclass
+++ b/meta-security-isafw/classes/isafw.bbclass
@@ -105,7 +105,7 @@  python process_reports_handler() {
     os.environ["PATH"] = savedenv["PATH"]
 }
 
-do_build[depends] += "cve-update-db-native:do_populate_cve_db ca-certificates-native:do_populate_sysroot"
+do_build[depends] += "cve-update-db-native:do_fetch ca-certificates-native:do_populate_sysroot"
 do_build[depends] += "python3-lxml-native:do_populate_sysroot"
 
 # These tasks are intended to be called directly by the user (e.g. bitbake -c)
@@ -179,7 +179,6 @@  fakeroot python do_analyse_image() {
 }
 
 do_rootfs[depends] += "checksec-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot"
-do_rootfs[depends] += "prelink-native:do_populate_sysroot"
 do_rootfs[depends] += "python3-lxml-native:do_populate_sysroot"
 
 isafw_init[vardepsexclude] = "DATETIME"