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

meta-digi: update to new github account 'digi-embedded' 

As the plan is to use the same git objects (SHA1) in the internal and
github repos, also remove that internal/external SRCREV infrastructure.

https://jira.digi.com/browse/DEL-2205

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2016-02-01 18:52:45 +01:00
parent 2bc7e6b026
commit 7915cc9c3f
6 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/conf/layer.conf
View File

@ -18,4 +18,4 @@ DIGI_MTK_GIT ?= "git://stash.digi.com/"
DIGI_GIT ?= "${DIGI_LOG_GIT}"
DIGI_PKG_SRC ?= "ftp://ftp1.digi.com/support/digiembeddedyocto/source"
DIGI_GITHUB_GIT ?= "git://github.com/digidotcom"
DIGI_GITHUB_GIT ?= "git://github.com/digi-embedded"

11
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
View File

@ -1,14 +1,11 @@
# Copyright (C) 2013 Digi International
# Internal repo branch
SRCBRANCH = "v2013.01/dub-2.0/maint"
SRCREV = "${AUTOREV}"
SRCREV_external = ""
SRCREV_internal = "${AUTOREV}"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
# Select internal or Github U-Boot repo
UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
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 = "${UBOOT_GIT_URI};branch=${SRCBRANCH}"
UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"

11
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
View File

@ -10,17 +10,14 @@ DEPENDS += "dtc-native u-boot-mkimage-native"
PROVIDES += "u-boot"
# Internal repo branch
SRCBRANCH = "v2015.04/master"
SRCREV = "${AUTOREV}"
SRCREV_external = ""
SRCREV_internal = "${AUTOREV}"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
# Select internal or Github U-Boot repo
UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
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)} \
${UBOOT_GIT_URI};branch=${SRCBRANCH} \
file://boot.txt \
"

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

@ -10,10 +10,11 @@ inherit kernel fsl-kernel-localversion
LOCALVERSION = "-dey"
SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git;nobranch=1"
SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${SRCBRANCH}"
# Select internal or Github Linux repo
LINUX_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
SRC_URI = " \
${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
${LINUX_GIT_URI};branch=${SRCBRANCH} \
file://defconfig \
"

6
meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
View File

@ -3,12 +3,8 @@
require recipes-kernel/linux/linux-dey.inc
require recipes-kernel/linux/linux-dtb.inc
# Internal repo branch
SRCBRANCH = "v3.10/dey-1.4/maint"
SRCREV_external = ""
SRCREV_internal = "${AUTOREV}"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRCREV = "${AUTOREV}"
config_dts() {
for DTB in ${KERNEL_DEVICETREE}; do

6
meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
View File

@ -5,11 +5,7 @@ require recipes-kernel/linux/linux-dtb.inc
inherit fsl-vivante-kernel-driver-handler
# Internal repo branch
SRCBRANCH = "v3.14/dey-2.0/maint"
SRCREV_external = ""
SRCREV_internal = "${AUTOREV}"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRCREV = "${AUTOREV}"
COMPATIBLE_MACHINE = "(ccimx6)"