meta-digi-arm: specify branch for git-based SRC_URI

This fix an error building 'nvram' for ccardimx28js:

ERROR: Fetcher failure: Unable to find revision ... in branch master even from
upstream

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-03-31 11:16:36 +02:00
parent daba0679b2
commit c8d1f48a9a
2 changed files with 6 additions and 2 deletions

View File

@ -1,11 +1,13 @@
# Copyright (C) 2013 Digi International # Copyright (C) 2013 Digi International
SRCBRANCH = "master"
SRCREV_external = "" SRCREV_external = ""
SRCREV_internal = "bd56e767e8fafc3b663877ba4c7009f706389acd" SRCREV_internal = "bd56e767e8fafc3b663877ba4c7009f706389acd"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" 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_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git" SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
UBOOT_NVRAM_LIBPATH = "git/common/digi/cmd_nvram/lib" UBOOT_NVRAM_LIBPATH = "git/common/digi/cmd_nvram/lib"

View File

@ -1,11 +1,13 @@
# Copyright (C) 2013 Digi International # Copyright (C) 2013 Digi International
SRCBRANCH = "v2013.01/master"
SRCREV_external = "" SRCREV_external = ""
SRCREV_internal = "958e055c9e4c0b3092097a865335bc743c2abce1" SRCREV_internal = "958e055c9e4c0b3092097a865335bc743c2abce1"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" 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_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git" SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" 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" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"