Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Hector Palacios 2021-09-07 12:01:32 +02:00
parent 9352fc1395
commit c33fc8a7fe
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
View File

@ -15,7 +15,12 @@ PROVIDES += "u-boot"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
# Select internal or Github U-Boot repo # 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 = " \ SRC_URI = " \
${UBOOT_GIT_URI};branch=${SRCBRANCH} \ ${UBOOT_GIT_URI};branch=${SRCBRANCH} \

7
meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
View File

@ -12,7 +12,12 @@ SRCREV = "${AUTOREV}"
S = "${WORKDIR}" S = "${WORKDIR}"
# Select internal or Github U-Boot repo # 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 = " \ SRC_URI = " \
${UBOOT_GIT_URI};branch=${SRCBRANCH} \ ${UBOOT_GIT_URI};branch=${SRCBRANCH} \

8
meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
View File

@ -8,7 +8,13 @@ SRCBRANCH = "v5.4.70/master"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
# Select internal or Github Linux repo # 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}" SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"