From f18f8035472914caa0f1cb2f0323b2a61bbb7236 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org> Date: Tue, 7 Mar 2017 22:44:41 +0100 Subject: [PATCH] Use morty branch for meta-security-isafw MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit isafw got incompatible with krogoth and morty on their master branch. Upstream added a morty branch (no krogoth branch). Use this branch. Change-Id: I388e17da89c33a791660f36c1f902274360a38c2 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> --- default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.xml b/default.xml index 86afbb7c..efe9e398 100644 --- a/default.xml +++ b/default.xml @@ -78,8 +78,8 @@ <project name="kraj/meta-altera" path="meta-altera" remote="github" revision="4364dbfcb600da82ecdfc4797f112d187e40f1c3" /> <!-- Image Security Analysis FrameWork (isafw) --> - <!-- newer version broken by use of 'staging_populate_sysroot_dir' in b45750ee93aac553142380ecd9130e5f5906eedf --> - <project name="01org/meta-security-isafw" path="meta-security-isafw" remote="github" revision="f44f15bb54057dd60399bb5dc7e0ecc7822168a2" /> + <!-- use morty branch for CC and DD - conflicting changes in master--> + <project name="01org/meta-security-isafw" path="meta-security-isafw" remote="github" revision="morty" /> <!-- IoT Security layer --> <!-- fixed version since 3936bc3 removed cynara --> -- 2.16.6