X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=default.xml;h=46fb5cc310e776a9673dc37f14979c313e0dabff;hb=09c5dda02d883605bced935c8c22e8edadfafb99;hp=7bb60b022061c33dfadd48036df7a707b5a918ca;hpb=155f29916b8dd15b8f99bde952d307a8562474ff;p=AGL%2FAGL-repo.git

diff --git a/default.xml b/default.xml
index 7bb60b02..46fb5cc3 100644
--- a/default.xml
+++ b/default.xml
@@ -21,12 +21,12 @@
 
   <remote fetch="git://git.freescale.com/imx" name="fsl-release" />
 
-  <default revision="master"
+  <default revision="chinook"
            remote="agl"
            sync-j="4" />
 
   <!-- AGL things. -->
-  <project name="AGL/meta-agl" path="meta-agl" />
+  <project name="AGL/meta-agl" path="meta-agl"/>
   <project name="AGL/meta-agl-extra" path="meta-agl-extra" />
   <project name="AGL/meta-agl-demo" path="meta-agl-demo" />
   <project name="AGL/meta-agl-devel" path="meta-agl-devel" />
@@ -56,7 +56,7 @@
   <project name="meta-ti" path="meta-ti" remote="yocto" revision="krogoth" />
 
   <!-- iotivity -->
-  <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.1.1" />
+  <project name="meta-oic" path="meta-oic" remote="yocto" revision="0bdd959e0dee4f63098702c302d1d214ac3d808a" />
 
   <!-- meta-amb -->
   <project name="tripzero/meta-amb" path="meta-amb" remote="github" revision="master" />
@@ -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" />