From c33fc8a7fe03e11dcee5b228bb389bdbae59a0e2 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Tue, 7 Sep 2021 12:01:32 +0200
Subject: [PATCH] uboot/linux: fix build from internal MTK Digi git server

Enabling DIGI_INTERNAL_GIT defaults to LOG server. The build from local
MTK Digi server was broken.

Fix uboot and linux recipes declaring different repo paths depending on
whether the local remote is LOG or MTK.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc          | 7 ++++++-
 .../recipes-digi/trustfence/trustfence-sign-tools_git.bb  | 7 ++++++-
 meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc      | 8 +++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
index 119565966..03d34678a 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
@@ -15,7 +15,12 @@ PROVIDES += "u-boot"
 S = "${WORKDIR}/git"
 
 # Select internal or Github U-Boot repo
-UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}/u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}"
+DIGI_LOG_REPO = "u-boot-denx.git"
+DIGI_MTK_REPO = "uboot/u-boot-denx.git"
+GITHUB_REPO = "u-boot.git"
+UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \
+					oe.utils.conditional('DIGI_GIT', '${DIGI_LOG_GIT}', '${DIGI_GIT}/${DIGI_LOG_REPO}', '${DIGI_GIT}/${DIGI_MTK_REPO};protocol=https', d), \
+					'${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}"
 
 SRC_URI = " \
     ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
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 51a5f54f6..6281d19b5 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
@@ -12,7 +12,12 @@ SRCREV = "${AUTOREV}"
 S = "${WORKDIR}"
 
 # Select internal or Github U-Boot repo
-UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}/u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}"
+DIGI_LOG_REPO = "u-boot-denx.git"
+DIGI_MTK_REPO = "uboot/u-boot-denx.git"
+GITHUB_REPO = "u-boot.git"
+UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \
+					oe.utils.conditional('DIGI_GIT', '${DIGI_LOG_GIT}', '${DIGI_GIT}/${DIGI_LOG_REPO}', '${DIGI_GIT}/${DIGI_MTK_REPO};protocol=ssh', d), \
+					'${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}"
 
 SRC_URI = " \
     ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index 7afefa3ae..bc8311738 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -8,7 +8,13 @@ SRCBRANCH = "v5.4.70/master"
 SRCREV = "${AUTOREV}"
 
 # Select internal or Github Linux repo
-LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}/linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}"
+DIGI_LOG_REPO = "linux-2.6.git"
+DIGI_MTK_REPO = "linux/linux.git"
+GITHUB_REPO = "linux.git"
+LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \
+					oe.utils.conditional('DIGI_GIT', '${DIGI_LOG_GIT}', '${DIGI_GIT}/${DIGI_LOG_REPO}', '${DIGI_GIT}/${DIGI_MTK_REPO};protocol=ssh', d), \
+					'${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}"
+
 SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"