From 2fd13737cbd31089c0dc334e18c8f220945140a9 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 25 Apr 2014 16:56:27 +0200 Subject: [PATCH] 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 --- .../imx-bootlets-dey/imx-bootlets-dey_git.bb | 8 ++------ .../recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc | 7 +++---- .../recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 7 +++---- .../recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc | 7 +++---- .../kernel-module-atheros/kernel-module-atheros.bb | 8 ++------ meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- .../recipes-kernel/linux/linux-dey_2.6.35.14.bb | 5 ++--- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 11 ++++------- 8 files changed, 20 insertions(+), 35 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb b/meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb index 58ad5df85..02572fb2d 100644 --- a/meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb +++ b/meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb @@ -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" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc index 4fab3d50c..bd2868011 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc @@ -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)}" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 6ecd20fec..a797167a9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -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)}" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc index ac3e174eb..7e5f9d73b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.04.inc @@ -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)}" diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb index e217fa4ea..efdc191bc 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb @@ -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 \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 96819ef5a..20b492f4b 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -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)} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb index c692ce50f..e7e2588c5 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb @@ -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}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 00ac6144a..65724ad3c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -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"