summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-03-07 22:44:41 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-03-07 22:44:45 +0100
commitf18f8035472914caa0f1cb2f0323b2a61bbb7236 (patch)
tree2a95e96261d8d4a208fe1e53c28f53e92425c94d
parent1d664aec4292177efb9cc3cc84904a884fc8ba52 (diff)
Use morty branch for meta-security-isafw
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>
-rw-r--r--default.xml4
1 files 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 -->