From 94b6e01c962b58ac2f0951335e58def7906aac33 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Mon, 24 Sep 2018 17:05:07 +0200
Subject: [PATCH] meta-digi-dey: revert some recipes to build from master
 branches

During the merge of the maintainance branch and the manual revert of
some recipes, these were forgotten.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../recipes-digi/trustfence/trustfence-sign-tools_git.bb    | 6 +++---
 .../recipes-digi/dey-examples/awsiotsdk-demo_git.bb         | 6 +++---
 .../recipes-digi/dey-examples/dey-examples-cryptochip.bb    | 6 +++---
 .../recipes-digi/dey-examples/dey-examples-digiapix.bb      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
index 6e391ba1b..882c70886 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 DEPENDS = "trustfence-cst coreutils util-linux"
 
-SRCBRANCH = "v2017.03/maint"
-SRCREV = "8d60f536d2063ac6a0676bdf34c4c8c8807371c5"
+SRCBRANCH = "v2017.03/master"
+SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"
 
@@ -14,7 +14,7 @@ S = "${WORKDIR}"
 UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
 
 SRC_URI = " \
-    ${UBOOT_GIT_URI};nobranch=1 \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
     file://trustfence-sign-kernel.sh;name=kernel-script \
     file://sign_uimage;name=kernel-sign \
     file://encrypt_uimage;name=kernel-encrypt \
diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
index 4165f97cb..b9b7c0f7b 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
@@ -14,15 +14,15 @@ AWS_USER_LED_ccimx6ulsbc ?= "488"
 AWS_USER_LED_ccimx6sbc ?= "34"
 AWS_USER_LED_ccimx6qpsbc ?= "34"
 
-SRCBRANCH = "dey-2.4/maint"
-SRCREV = "6bb9699c29107cad06654bf537e92e4c9ec1b45c"
+SRCBRANCH = "master"
+SRCREV = "${AUTOREV}"
 
 CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"
 
 CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
-SRC_URI = "${CC_GIT_URI};nobranch=1"
+SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git/awsiot-sample"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
index a86999278..cc957ac2a 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 DEPENDS = "cryptoauthlib"
 
-SRCBRANCH = "dey-2.4/maint"
-SRCREV = "6bb9699c29107cad06654bf537e92e4c9ec1b45c"
+SRCBRANCH = "master"
+SRCREV = "${AUTOREV}"
 
 CC_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 CC_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"
 
 CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
-SRC_URI = "${CC_GIT_URI};nobranch=1"
+SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git/cryptochip-get-random"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb
index e54ad573a..28918bcc6 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-digiapix.bb
@@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 
 DEPENDS = "libdigiapix"
 
-SRCBRANCH = "dey-2.4/maint"
-SRCREV = "6bb9699c29107cad06654bf537e92e4c9ec1b45c"
+SRCBRANCH = "master"
+SRCREV = "${AUTOREV}"
 
 LIBDIGIAPIX_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
 LIBDIGIAPIX_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"
 
 LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}"
 
-SRC_URI = "${LIBDIGIAPIX_GIT_URI};nobranch=1"
+SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"