Patchwork More changes for git fetchers

login
register
mail settings
Submitter Gary Thomas
Date Dec. 6, 2013, 6:51 p.m.
Message ID <1386355878-11565-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/62999/
State Not Applicable
Delegated to: Otavio Salvador
Headers show

Comments

Gary Thomas - Dec. 6, 2013, 6:51 p.m.
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 <gary@mlbassoc.com>

---
 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(-)
Eric Nelson - Dec. 7, 2013, 12:20 a.m.
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 <gary@mlbassoc.com>
>
> ---
>   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.

> 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.

Regards,


Eric
Gary Thomas - Dec. 7, 2013, noon
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 <gary@mlbassoc.com>
>>
>> ---
>>   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.
Eric Nelson - Dec. 7, 2013, 4:53 p.m.
On 12/07/2013 05:00 AM, Gary Thomas wrote:
> 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 <gary@mlbassoc.com>
>>>
>>> ---
>>>   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
>

Thanks. I hadn't noticed.

 >  <snip>
>
> 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
>

That makes sense.

Patch

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"
 
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 \