diff options
author | Armin Kuster <akuster808@gmail.com> | 2020-02-22 08:13:31 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-03-01 22:16:14 -0800 |
commit | 0e0472f3767e639c190f6c84800574cfe51d2e46 (patch) | |
tree | 8ac45e7c93454bfaa38ca1ae1e3ea6e183dbde76 | |
parent | 4842e142998f4bc56484fc542b3448c2e72d084f (diff) | |
download | meta-security-0e0472f3767e639c190f6c84800574cfe51d2e46.tar.gz |
isafw: fix to work against master
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-security-isfafw/classes/isafw.bbclass (renamed from meta-security-isafw/classes/isafw.bbclass) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-security-isafw/classes/isafw.bbclass b/meta-security-isfafw/classes/isafw.bbclass index bec8d88..146acdf 100644 --- a/meta-security-isafw/classes/isafw.bbclass +++ b/meta-security-isfafw/classes/isafw.bbclass | |||
@@ -105,8 +105,8 @@ 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-check-tool-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" | 108 | do_build[depends] += "cve-update-db-native:do_populate_cve_db ca-certificates-native:do_populate_sysroot" |
109 | do_build[depends] += "python-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) |
112 | 112 | ||
@@ -180,14 +180,14 @@ fakeroot python do_analyse_image() { | |||
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" | 182 | do_rootfs[depends] += "prelink-native:do_populate_sysroot" |
183 | do_rootfs[depends] += "python-lxml-native:do_populate_sysroot" | 183 | do_rootfs[depends] += "python3-lxml-native:do_populate_sysroot" |
184 | 184 | ||
185 | isafw_init[vardepsexclude] = "DATETIME" | 185 | isafw_init[vardepsexclude] = "DATETIME" |
186 | def isafw_init(isafw, d): | 186 | def isafw_init(isafw, d): |
187 | import re, errno | 187 | import re, errno |
188 | 188 | ||
189 | isafw_config = isafw.ISA_config() | 189 | isafw_config = isafw.ISA_config() |
190 | # Override the builtin default in curl-native (used by cve-check-tool-native) | 190 | # Override the builtin default in curl-native (used by cve-update-db-nativ) |
191 | # because that default is a path that may not be valid: when curl-native gets | 191 | # because that default is a path that may not be valid: when curl-native gets |
192 | # installed from sstate, we end up with the sysroot path as it was on the | 192 | # installed from sstate, we end up with the sysroot path as it was on the |
193 | # original build host, which is not necessarily the same path used now | 193 | # original build host, which is not necessarily the same path used now |