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

meta-digi-arm: remove SRCBRANCH support for external repos 

Needing to set the branch where a specific SHA1 revision is contained is
a unnecessary constraint that can be bypassed setting 'nobranch=1' in
the SRC_URI.

We do that for all the external repos (GitHub) plus the internal ones
for the im-xbootlets and the atheros kernel module (as those two repos
are stable enough and we are not developing actively on them).

For U-Boot and Linux we keep the SRCBRANCH framework for internal repos
as this is needed for the AUTOREV yocto feature.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-04-25 16:56:27 +02:00
parent 5569e543d0
commit 2fd13737cb
8 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb
View File

@ -7,16 +7,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
PR = "${DISTRO}.r0"
SRCBRANCH_external = "master"
SRCBRANCH_internal = "master"
SRCBRANCH = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCBRANCH_internal}', '${SRCBRANCH_external}', d)}"
SRCREV_external = "91b63896c57cf0c9ab16371387c8c62931257aca"
SRCREV_internal = "967bc502cdb5073ca05fa13dfe588a5509066735"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/imx-bootlets.git;protocol=git;branch=${SRCBRANCH}"
SRC_URI_internal = "${DIGI_MTK_GIT}linux/imx-bootlets.git;protocol=ssh;branch=${SRCBRANCH}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/imx-bootlets.git;protocol=git;nobranch=1"
SRC_URI_internal = "${DIGI_MTK_GIT}linux/imx-bootlets.git;protocol=ssh;nobranch=1"
SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
S = "${WORKDIR}/git"

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

@ -1,14 +1,13 @@
# Copyright (C) 2013 Digi International
SRCBRANCH_external = "v2009.08/master"
SRCBRANCH_internal = "master"
SRCBRANCH = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCBRANCH_internal}', '${SRCBRANCH_external}', d)}"
# Internal repo branch
SRCBRANCH = "master"
SRCREV_external = "8b22aa710c72a5daeb6f79852f1a4fb08abf37d4"
SRCREV_internal = "${AUTOREV}"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;branch=${SRCBRANCH}"
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)}"

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

@ -1,14 +1,13 @@
# Copyright (C) 2013 Digi International
SRCBRANCH_external = "v2013.01/master"
SRCBRANCH_internal = "v2013.01/master"
SRCBRANCH = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCBRANCH_internal}', '${SRCBRANCH_external}', d)}"
# Internal repo branch
SRCBRANCH = "v2013.01/master"
SRCREV_external = "a02784c8a21e04515c8905a32e947cb776b4f565"
SRCREV_internal = "${AUTOREV}"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;branch=${SRCBRANCH}"
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)}"

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

@ -1,13 +1,12 @@
# Copyright (C) 2013 Digi International
SRCBRANCH_external = "v2013.04/master"
SRCBRANCH_internal = "v2013.04/master"
SRCBRANCH = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCBRANCH_internal}', '${SRCBRANCH_external}', d)}"
# Internal repo branch
SRCBRANCH = "v2013.04/master"
SRCREV_external = "71a9263c710a58c1c97307238507c6e7804101ee"
SRCREV_internal = "${AUTOREV}"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;branch=${SRCBRANCH}"
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)}"

8
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
View File

@ -12,16 +12,12 @@ PR = "r1"
# from busybox does not support '--ignore-install' option.
RDEPENDS_${PN} = "kmod"
SRCBRANCH_external = "master"
SRCBRANCH_internal = "dey-1.6/maint"
SRCBRANCH = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCBRANCH_internal}', '${SRCBRANCH_external}', d)}"
SRCREV_external = "621b43aef3f4611500c461ef8940fa7990d55d9e"
SRCREV_internal = "fdb797adf47514f5c94921fb20e64b4ecadb7a52"
SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git;branch=${SRCBRANCH}"
SRC_URI_internal = "${DIGI_GIT}linux-modules/atheros.git;protocol=git;branch=${SRCBRANCH}"
SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git;nobranch=1"
SRC_URI_internal = "${DIGI_GIT}linux-modules/atheros.git;protocol=git;nobranch=1"
SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
SRC_URI += " \
file://atheros \

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

@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-imx.inc
LOCALVERSION = "-dey"
SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git;branch=${SRCBRANCH}"
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}"
SRC_URI = " \
${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \

5
meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb
View File

@ -4,9 +4,8 @@ require recipes-kernel/linux/linux-dey.inc
COMPATIBLE_MACHINE = "(mxs|mx5)"
SRCBRANCH_external = "v2.6.35/dey-1.4/maint"
SRCBRANCH_internal = "v2.6.35/dey-1.4/maint"
SRCBRANCH = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCBRANCH_internal}', '${SRCBRANCH_external}', d)}"
# Internal repo branch
SRCBRANCH = "v2.6.35/dey-1.4/maint"
SRCREV_external = "04e6c93c509e4f0b2fe6c713674704f3b3fa1416"
SRCREV_internal = "${AUTOREV}"

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

@ -5,13 +5,10 @@ require recipes-kernel/linux/linux-dtb.inc
DEPENDS += "lzop-native bc-native"
SRCBRANCH_external = ""
SRCBRANCH_external_mxs = "v3.10/dey-1.4/maint"
SRCBRANCH_external_mx6 = "v3.10/dey-1.6/maint"
SRCBRANCH_internal = ""
SRCBRANCH_internal_mxs = "v3.10/dey-1.4/maint"
SRCBRANCH_internal_mx6 = "v3.10/dey-1.6/maint"
SRCBRANCH = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCBRANCH_internal}', '${SRCBRANCH_external}', d)}"
# Internal repo branch
SRCBRANCH = ""
SRCBRANCH_mxs = "v3.10/dey-1.4/maint"
SRCBRANCH_mx6 = "v3.10/dey-1.6/maint"
SRCREV_external = ""
SRCREV_external_mxs = "bccdf5cb75ba94d642c7893ba166dd1cb7d38985"