From 04aa734d75e7949a37e421759385a6cc00c48fc7 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Tue, 26 Mar 2019 13:22:25 +0100
Subject: [PATCH] dey-examples: create common file for the dey-examples repo
 URL/branch

This reduces the number of files that must be modified when changing
branches between development/release modes.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../dey-examples/awsiotsdk-demo_git.bb             | 14 ++++----------
 .../dey-examples/dey-examples-cryptochip.bb        | 14 ++++----------
 .../dey-examples/dey-examples-digiapix.bb          | 14 ++++----------
 .../recipes-digi/dey-examples/dey-examples-src.inc |  9 +++++++++
 4 files changed, 21 insertions(+), 30 deletions(-)
 create mode 100644 meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc

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 72e81e0cf..6b9a696a6 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
@@ -1,4 +1,6 @@
-# Copyright (C) 2017 Digi International.
+# Copyright (C) 2017-2019, Digi International Inc.
+
+require recipes-digi/dey-examples/dey-examples-src.inc
 
 SUMMARY = "AWS IoT device SDK Demo"
 DESCRIPTION = "Demo application for AWS IoT device SDK"
@@ -14,15 +16,7 @@ AWS_USER_LED_ccimx6ulsbc ?= "488"
 AWS_USER_LED_ccimx6sbc ?= "34"
 AWS_USER_LED_ccimx6qpsbc ?= "34"
 
-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 ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
-
-SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"
+SRC_URI = "${DEY_EXAMPLES_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 6f76dff2d..ba7235f4d 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
@@ -1,4 +1,6 @@
-# Copyright (C) 2017, 2018 Digi International.
+# Copyright (C) 2017-2019, Digi International Inc.
+
+require recipes-digi/dey-examples/dey-examples-src.inc
 
 SUMMARY = "DEY examples: Cryptochip example application"
 SECTION = "examples"
@@ -7,15 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 DEPENDS = "cryptoauthlib"
 
-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 ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
-
-SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}"
+SRC_URI = "${DEY_EXAMPLES_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 56008e390..f5551e11e 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
@@ -1,4 +1,6 @@
-# Copyright (C) 2017, 2018, Digi International Inc.
+# Copyright (C) 2017-2019, Digi International Inc.
+
+require recipes-digi/dey-examples/dey-examples-src.inc
 
 SUMMARY = "DEY Digi APIX examples"
 SECTION = "examples"
@@ -7,15 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 
 DEPENDS = "libdigiapix"
 
-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 ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_STASH}', '${LIBDIGIAPIX_GITHUB}', d)}"
-
-SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}"
+SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
new file mode 100644
index 000000000..88c7e3720
--- /dev/null
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
@@ -0,0 +1,9 @@
+# Copyright (C) 2019, Digi International Inc.
+
+SRCBRANCH = "master"
+SRCREV = "${AUTOREV}"
+
+DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
+DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=git"
+
+DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}"