From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.chez-thomas.org (mail.mlbassoc.com [65.100.170.105]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id C80F9E007B4 for ; Sat, 7 Dec 2013 03:59:29 -0800 (PST) Received: by mail.chez-thomas.org (Postfix, from userid 1998) id F3531F81205; Sat, 7 Dec 2013 04:59:25 -0700 (MST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on hermes.chez-thomas.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable version=3.3.2 Received: from [192.168.1.114] (zeus [192.168.1.114]) by mail.chez-thomas.org (Postfix) with ESMTP id A584BF81202; Sat, 7 Dec 2013 04:59:24 -0700 (MST) Message-ID: <52A30DC9.9080401@mlbassoc.com> Date: Sat, 07 Dec 2013 05:00:09 -0700 From: Gary Thomas User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: Eric Nelson , meta-freescale@yoctoproject.org References: <1386355878-11565-1-git-send-email-gary@mlbassoc.com> <52A269E4.4040306@boundarydevices.com> In-Reply-To: <52A269E4.4040306@boundarydevices.com> Subject: Re: [PATCH] More changes for git fetchers X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 11:59:35 -0000 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2013-12-06 17:20, Eric Nelson wrote: > Hi Gary, > > On 12/06/2013 11:51 AM, Gary Thomas wrote: >> Recipes now need to explicitly mention the branch used for git repositories. >> These changes reflect this, allowing for the branch to be overridden by >> .bbappend files >> >> Signed-off-by: Gary Thomas >> >> --- >> recipes-bsp/u-boot/u-boot-boundary_git.bb | 3 ++- >> recipes-bsp/u-boot/u-boot-script-boundary_git.bb | 3 ++- >> recipes-kernel/linux/linux-boundary_3.0.35.bb | 4 ++-- >> 3 files changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/recipes-bsp/u-boot/u-boot-boundary_git.bb b/recipes-bsp/u-boot/u-boot-boundary_git.bb >> index f612b3f..323cfdf 100644 >> --- a/recipes-bsp/u-boot/u-boot-boundary_git.bb >> +++ b/recipes-bsp/u-boot/u-boot-boundary_git.bb >> @@ -9,7 +9,8 @@ PROVIDES = "u-boot" >> PV = "v2013.07+git${SRCPV}" >> >> SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f" >> -SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git" >> +SRCBRANCH = "production-before-20131107" >> +SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}" >> >> S = "${WORKDIR}/git" >> > > I'm not quite grokking why both the branch and the SRCREV are needed. > > It seems that SRCREV is more specific than the branch. Except that the bitbake fetch code recently changed and if the SRCREV is not on the master branch, it will fail like this: ERROR: Fetcher failure: Unable to find revision f89bc066db0569008418fac1a0408a9a57f2232f in branch master even from upstream ERROR: Function failed: Fetcher failure for URL: 'git://github.com/boundarydevices/u-boot-imx6.git'. Unable to fetch URL from any source. ERROR: Logfile of failure stored in: /local/imx6_new/tmp/work/sabrelite-amltd-linux-gnueabi/u-boot-script-boundary/v2013.01+gitAUTOINC+f89bc066db-r0/temp/log.do_fetch.25222 ERROR: Task 144 (/local/poky-multi/meta-fsl-arm-extra/recipes-bsp/u-boot/u-boot-script-boundary_git.bb, do_fetch) failed with exit code '1' I made the branch name a variable as not everyone using a given recipe may be using the same revision/branch, e.g. I have some targets that use linux-boundary that are still on boundary-imx_3.0.35_4.0.0 > >> diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb >> index 06ad438..d14e094 100644 >> --- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb >> +++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb >> @@ -6,7 +6,8 @@ DEPENDS = "u-boot-mkimage-native" >> PV = "v2013.01+git${SRCPV}" >> >> SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f" >> -SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git" >> +SRCBRANCH = "production-before-20131107" >> +SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}" >> >> S = "${WORKDIR}/git" >> >> diff --git a/recipes-kernel/linux/linux-boundary_3.0.35.bb b/recipes-kernel/linux/linux-boundary_3.0.35.bb >> index 7875f93..872cab2 100644 >> --- a/recipes-kernel/linux/linux-boundary_3.0.35.bb >> +++ b/recipes-kernel/linux/linux-boundary_3.0.35.bb >> @@ -5,12 +5,12 @@ require recipes-kernel/linux/linux-imx.inc >> >> DESCRIPTION = "Linux kernel for Boundary Devices boards" >> >> -SRC_URI = "git://github.com/boundarydevices/linux-imx6.git \ >> +SRC_URI = "git://github.com/boundarydevices/linux-imx6.git;branch=${SRCBRANCH} \ >> file://defconfig" >> >> LOCALVERSION = "-4.1.0+yocto" >> SRCREV = "58099389255add7c17ce6babf37a50ce5d11d6b8" >> - >> +SRCBRANCH = "boundary-imx_3.0.35_4.1.0" >> >> # GPU support patches >> SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \ >> > > BTW, I need to update both of these (U-Boot and 3.0.35 kernel), as we > have some patches I think most folks will want. -- ------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------