From 0817e87e61d0dbcde7336a66d04a45d57b463260 Mon Sep 17 00:00:00 2001
From: Seth Bollinger <sethb@digi.com>
Date: Mon, 14 Oct 2013 08:48:45 -0500
Subject: [PATCH] URI: Change DIGI_LOG_GIT to something generic

Most SRC_URI defaults to DIGI_LOG_GIT. This patch sets a more generic
name (DIGI_GIT) that defaults to DIGI_LOG_GIT, but is configurable by
someone who might want to tune it (DIGI_MTK_GIT, etc.).

Signed-off-by: Seth Bollinger <sethb@digi.com>
---
 meta-digi-arm/conf/layer.conf                                   | 1 +
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc     | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc     | 2 +-
 .../kernel-module-atheros/kernel-module-atheros.bb              | 2 +-
 .../kernel-module-redpine/kernel-module-redpine.bb              | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc  | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc       | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index 3818e2759..e5989a2b7 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -20,6 +20,7 @@ DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
 
 DIGI_LOG_GIT ?= "git://log-sln-git.digi.com/"
 DIGI_MTK_GIT ?= "git://stash.digi.com/"
+DIGI_GIT	 ?= "${DIGI_LOG_GIT}"
 DIGI_MIRROR  ?= "ftp://ftp1.digi.com/support/digiembeddedyocto/source"
 
 DIGI_GITHUB_GIT ?= "git://github.com/dgii"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
index 9314888bc..e0c69b6d0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
@@ -5,7 +5,7 @@ SRCREV_internal = "d4f95c9d1a6619841ce07b8ff2b63d7676c6d6cc"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
-SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 UBOOT_NVRAM_LIBPATH = "git/common/digi/cmd_nvram/lib"
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 35d2f512a..eed0b086d 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
@@ -5,7 +5,7 @@ SRCREV_internal = "c0fadb69aeab54ad1afb9db1f9ba0701ab8d6807"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
-SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
index b8b6ad119..33ee5d6c5 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
@@ -17,7 +17,7 @@ SRCREV_internal = "${@base_conditional('IS_KERNEL_2X', '1' , 'f18d0de2ee85b6e768
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git"
-SRC_URI_internal = "${DIGI_LOG_GIT}linux-modules/atheros.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}linux-modules/atheros.git;protocol=git"
 SRC_URI  = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 SRC_URI += " \
     file://atheros \
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
index 3f6e7a209..3ef0c3894 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
@@ -17,7 +17,7 @@ TARBALL_SHA256_ccimx51js = "3f855614573da0bc250cfc021f69a1aaba1d7c7c3a6347488604
 TARBALL_MD5_ccimx53js    = "4a84d4da7479a20db5ee76f81c33f7b1"
 TARBALL_SHA256_ccimx53js = "6e8d35f735172621b5b6c40aafd754aecd8371c6cc1589f9502c8f3098b3a90a"
 
-SRC_URI_git = "${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git"
+SRC_URI_git = "${DIGI_GIT}linux-modules/redpine.git;protocol=git"
 SRC_URI_obj = "${DIGI_MIRROR}/redpine-${MACHINE}-${SRCREV_SHORT}.tar.gz;md5sum=${TARBALL_MD5};sha256sum=${TARBALL_SHA256}"
 SRC_URI  = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_git}', '${SRC_URI_obj}', d)}"
 SRC_URI += " \
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc
index 8c1c79b57..9b9bdc175 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_2.6.35.14.inc
@@ -5,5 +5,5 @@ SRCREV_internal = "eadb42b86adce380ff2a706ab1c34458eee4bd38"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"
-SRC_URI_internal = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
index 3a2b03b94..cc6021f60 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
@@ -5,5 +5,5 @@ SRCREV_internal = "26cd72478512fb11f306698a06ecef420d912f8b"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"
-SRC_URI_internal = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"