Use morty branch for meta-security-isafw

[AGL/AGL-repo.git] / default.xml

diff --git a/default.xml b/default.xml
index 434e7b3..efe9e39 100644 (file)
--- a/default.xml
+++ b/default.xml
@@ -68,7 +68,7 @@
   <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="a506df4ba4b186e311117d5bdc6a54844583a4fd" />
 
   <!-- rpi 2 and 3 -->
-  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="morty" />
+  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="69c56754bdd6417de5b69d3c8c3684ecff8e4651" />
 
   <!-- DragonBoard 410c specific things -->
   <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="morty" />
@@ -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 -->