From 247df66459fe2d5720b25d65a0efd6565b1dd9f0 Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Tue, 11 Apr 2017 15:20:27 +0200
Subject: [PATCH] meta-digi: revert revisions to AUTOREV

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc   | 4 ++--
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb        | 4 ++--
 .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb      | 4 ++--
 meta-digi-arm/recipes-kernel/linux/linux-dey.inc              | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb           | 2 +-
 .../recipes-digi/cloudconnector/cloudconnector_git.bb         | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
index 67263505d..03d459756 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
@@ -1,11 +1,11 @@
 # Copyright (C) 2013 Digi International
 
 SRCBRANCH = "v2013.01/dub-2.0/maint"
-SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401"
+SRCREV = "${AUTOREV}"
 
 # Select internal or Github U-Boot repo
 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"
+SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}"
 
 UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
index 92bf57387..8c99a86e0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native',
 PROVIDES += "u-boot"
 
 SRCBRANCH = "v2015.04/maint"
-SRCREV = "5a72b2288be7f29e9ac2a4d72770bc34aaaec748"
+SRCREV = "${AUTOREV}"
 
 # Select internal or Github U-Boot repo
 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} \
 "
 
 SRC_URI_append = " \
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb
index 71713ab5f..f70e0e122 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 SRCBRANCH = "v2015.04/maint"
-SRCREV = "5a72b2288be7f29e9ac2a4d72770bc34aaaec748"
+SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"
 
@@ -11,7 +11,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-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index 43d0f3201..1f7eb809e 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -16,7 +16,7 @@ LOCALVERSION = "-dey"
 LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
 
 SRC_URI = " \
-    ${LINUX_GIT_URI};nobranch=1 \
+    ${LINUX_GIT_URI};branch=${SRCBRANCH} \
     file://defconfig \
 "
 
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
index d6215f7f9..6d7e0ec69 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
@@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc
 require recipes-kernel/linux/linux-dtb.inc
 
 SRCBRANCH = "v3.10/dey-1.4/maint"
-SRCREV = "8a6a9230dfe407e1764b5db8ef5b15601d85cfd2"
+SRCREV = "${AUTOREV}"
 
 config_dts() {
 	for DTB in ${KERNEL_DEVICETREE}; do
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
index 1649cc804..6819a65b9 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
@@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc
 inherit fsl-vivante-kernel-driver-handler
 
 SRCBRANCH = "v3.14/dey-2.0/maint"
-SRCREV = "18747e099eccc726c3abc44b7fbe537ffcce186f"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb
index 1caa59cd0..b2a62d6db 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb
@@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc
 require recipes-kernel/linux/linux-dtb.inc
 
 SRCBRANCH = "v4.1/dey-2.2/maint"
-SRCREV = "e6faff0accececaf58f4b5f1b00861d79d664795"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx6ul)"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index 9f7e98759..df5c2d21f 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7
 DEPENDS = "confuse openssl recovery-utils zlib"
 
 SRCBRANCH = "master"
-SRCREV = "5c79d1ddde37c18f4f311fb0046f85c1e2f6a38a"
+SRCREV = "${AUTOREV}"
 
 CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh"
 CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.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"