Update for gatesgarth

* Update from dunfell brach

* Use newer version of the rust compiler

Author: myagley

README.md

@@ -5,19 +5,34 @@ This layer provides support for building [IoT Edge](https://github.com/azure/iot
 
 Please see the corresponding sections below for details.
 
+Dependencies
+------------
+This layer depends on:
+
+```
+URI: git://github.com/meta-rust/meta-rust.git
+branch: master
+revision: e4d25b98083bcecb94df6ee189a165d63ede7f3d
+prio: default
+```
+
+```
+URI: git://git.yoctoproject.org/meta-virtualization
+branch: dunfell
+revision: HEAD
+prio: default
+```
+
+```
+URI: git://github.com/openembedded/openembedded-core.git
+branch: dunfell
+revision: HEAD
+prio: default
+```
+
 Adding the meta-iotedge layer to your build
 =================================================
 
-Use the branch of `meta-iotedge` corresponding to your Yocto release:
-
-* [Sumo](https://github.com/Azure/meta-iotedge/tree/sumo) - `git clone -b sumo https://github.com/Azure/meta-iotedge.git`
-* [Thud](https://github.com/Azure/meta-iotedge/tree/thud) - `git clone -b thud https://github.com/Azure/meta-iotedge.git`
-* [Warrior](https://github.com/Azure/meta-iotedge/tree/warrior) - `git clone -b warrior https://github.com/Azure/meta-iotedge.git`
-* [Zeus](https://github.com/Azure/meta-iotedge/tree/zeus) - `git clone -b zeus https://github.com/Azure/meta-iotedge.git`
-* [Dunfell](https://github.com/Azure/meta-iotedge/tree/dunfell) - `git clone -b dunfell https://github.com/Azure/meta-iotedge.git`
-
-In almost all cases, you should not use the `master` branch of `meta-iotedge` in your image.
-
 Run `bitbake-layers add-layer meta-iotedge`
 
 Contributing

builds/checkin.yaml

@@ -3,26 +3,22 @@ pr:
   branches:
     include:
       - master
-      - sumo
-      - thud
-      - warrior
-      - zeus
       - dunfell
 jobs:
 
 ################################################################################
-  - job: sumo
+  - job: dunfell
 ################################################################################
-    displayName: Sumo
+    displayName: Dunfell
     pool:
       name: azureiotedge
       demands:
         - yocto
     timeoutInMinutes: 360
     steps:
-      - script: scripts/fetch.sh sumo
+      - script: scripts/fetch.sh dunfell
         displayName: Fetch
         env:
-          METARUST_REV: 'refs/remotes/origin/master'
+          METARUST_REV: 'e4d25b98083bcecb94df6ee189a165d63ede7f3d'
       - script: scripts/build.sh
         displayName: Build

conf/layer.conf

@@ -10,5 +10,5 @@ BBFILE_PATTERN_meta-iotedge = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-iotedge = "10"
 
 LAYERDEPENDS_meta-iotedge = "core rust-layer virtualization-layer"
-LAYERSERIES_COMPAT_meta-iotedge = "rocko sumo"
+LAYERSERIES_COMPAT_meta-iotedge = "dunfell"
 

conf/local.conf.sample

@@ -220,10 +220,12 @@ BB_DISKMON_DIRS = "\
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
 
-SSTATE_MIRRORS ?= "file://.* http://build-cache.asterius.io/master/sstate-cache/PATH;downloadfilename=PATH \n"
-
-SOURCE_MIRROR_URL ?= "http://build-cache.asterius.io/downloads/"
-INHERIT += "own-mirrors rm_work"
+SSTATE_MIRRORS = "\
+    file://.* http://sstate.yoctoproject.org/3.1/PATH;downloadfilename=PATH \n \
+    file://.* http://sstate.yoctoproject.org/3.1.1/PATH;downloadfilename=PATH \n \
+    file://.* http://sstate.yoctoproject.org/3.1.2/PATH;downloadfilename=PATH \n \
+    file://.* http://sstate.yoctoproject.org/3.1.3/PATH;downloadfilename=PATH \n \
+    "
 
 #
 # Qemu configuration

recipes-core/iotedge-cli/iotedge-cli-1.0.5.inc

@@ -0,0 +1 @@
+export VERSION = "1.0.9.4"

recipes-core/iotedge-cli/iotedge-cli-1.0.6.1.inc

@@ -1,10 +1,12 @@
-DEPENDS += "openssl10"
+DEPENDS += "openssl virtual/libiothsm"
+RDEPENDS_${PN} += "virtual/libiothsm"
 
-export BUILD_SOURCEVERSION="${SRCREV}"
+export OPENSSL_DIR = "${STAGING_EXECPREFIXDIR}"
+export LIBIOTHSM_NOBUILD="On"
 
 do_install () {
     # Binaries
     install -d  "${D}${bindir}"
-    install -m 755 "${WORKDIR}/git/edgelet/target/${CARGO_TARGET_SUBDIR}/iotedge" ${D}${bindir}/iotedge
+    install -m 755 "${WORKDIR}/iotedge-${PV}/edgelet/target/${CARGO_TARGET_SUBDIR}/iotedge" ${D}${bindir}/iotedge
 }