diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-03-07 22:40:14 +0100 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-03-07 22:40:14 +0100 |
commit | 09c5dda02d883605bced935c8c22e8edadfafb99 (patch) | |
tree | c9a791f0831cf32d1ef6cae9fabee62a833d792a | |
parent | 4986156e9980c3c140777aaaf0c644bc33e20295 (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: Iff11c1d163f03894c903e7d669f1b3915bd4d8ec
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r-- | default.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/default.xml b/default.xml index b91e1a33..46fb5cc3 100644 --- a/default.xml +++ b/default.xml @@ -71,7 +71,8 @@ <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="krogoth" /> <!-- Image Security Analysis FrameWork (isafw) --> - <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="master" /> + <!-- use morty branch for CC and DD - conflicting changes in master--> + <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="morty" /> <!-- IoT Security layer --> <project name="meta-intel-iot-security" path="meta-intel-iot-security" remote="01org" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" /> |