diff options
author | Akshay Bhat <nodeax@gmail.com> | 2022-03-03 11:39:19 -0500 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-03-11 21:08:22 -0800 |
commit | ba4485f331e5d93195fae39f454114ed88c1d56c (patch) | |
tree | 2dbf897bf1e5cad7eda00c905b3c276b113cefe9 | |
parent | 2993f459fcf352cb868e53b242a8d2e8a29b9796 (diff) | |
download | meta-security-ba4485f331e5d93195fae39f454114ed88c1d56c.tar.gz |
meta-security-isafw: Fixes to work with oe-core master
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-security-isafw/classes/isafw.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
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() { | |||
105 | os.environ["PATH"] = savedenv["PATH"] | 105 | os.environ["PATH"] = savedenv["PATH"] |
106 | } | 106 | } |
107 | 107 | ||
108 | do_build[depends] += "cve-update-db-native:do_populate_cve_db ca-certificates-native:do_populate_sysroot" | 108 | do_build[depends] += "cve-update-db-native:do_fetch ca-certificates-native:do_populate_sysroot" |
109 | do_build[depends] += "python3-lxml-native:do_populate_sysroot" | 109 | do_build[depends] += "python3-lxml-native:do_populate_sysroot" |
110 | 110 | ||
111 | # These tasks are intended to be called directly by the user (e.g. bitbake -c) | 111 | # These tasks are intended to be called directly by the user (e.g. bitbake -c) |
@@ -179,7 +179,6 @@ fakeroot python do_analyse_image() { | |||
179 | } | 179 | } |
180 | 180 | ||
181 | do_rootfs[depends] += "checksec-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" | 181 | do_rootfs[depends] += "checksec-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
182 | do_rootfs[depends] += "prelink-native:do_populate_sysroot" | ||
183 | do_rootfs[depends] += "python3-lxml-native:do_populate_sysroot" | 182 | do_rootfs[depends] += "python3-lxml-native:do_populate_sysroot" |
184 | 183 | ||
185 | isafw_init[vardepsexclude] = "DATETIME" | 184 | isafw_init[vardepsexclude] = "DATETIME" |