Patchwork [meta-fsl-arm-extra,1/2] linux-wandboard (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH

login
register
mail settings
Submitter John Weber
Date Feb. 28, 2014, 2:38 a.m.
Message ID <1393555094-18428-1-git-send-email-rjohnweber@gmail.com>
Download mbox | patch
Permalink /patch/67687/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

John Weber - Feb. 28, 2014, 2:38 a.m.
The following changes are made:
- Update SRCREV to 95f32b7
- Switch SRCBRANCH to the _test branch
- Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in
  local.conf

squash this

Signed-off-by: John Weber <rjohnweber@gmail.com>
---
 recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
 recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
Otavio Salvador - Feb. 28, 2014, 2:57 a.m.
On Thu, Feb 27, 2014 at 11:38 PM, John Weber <rjohnweber@gmail.com> wrote:
> The following changes are made:
> - Update SRCREV to 95f32b7
> - Switch SRCBRANCH to the _test branch
> - Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in
>   local.conf
>
> squash this

Squash this! ;-)

Why to use a _test branch? It might be better to merge it in the
3.10.17-1.0.0-beta branch and drop the test suffix.
John Weber - Feb. 28, 2014, 3:05 a.m.
Well, looks like I was rebase-ing a little too quickly...  :-)

On 2/27/14, 8:57 PM, Otavio Salvador wrote:
> On Thu, Feb 27, 2014 at 11:38 PM, John Weber <rjohnweber@gmail.com> wrote:
>> The following changes are made:
>> - Update SRCREV to 95f32b7
>> - Switch SRCBRANCH to the _test branch
>> - Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in
>>    local.conf
>>
>> squash this
> Squash this! ;-)
>
> Why to use a _test branch? It might be better to merge it in the
> 3.10.17-1.0.0-beta branch and drop the test suffix.
>
Daiane Angolini - Feb. 28, 2014, 12:49 p.m.
> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of John Weber
> Sent: Thursday, February 27, 2014 11:38 PM
> To: meta-freescale@yoctoproject.org
> Subject: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2] linux-wandboard
> (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH
> 
> The following changes are made:
> - Update SRCREV to 95f32b7
> - Switch SRCBRANCH to the _test branch
> - Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in
>   local.conf
> 
> squash this

Squash this?

> 
> Signed-off-by: John Weber <rjohnweber@gmail.com>
> ---
>  recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
>  recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
>  2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-
> kernel/linux/linux-wandboard.inc
> index 57e5517..8a6e011 100644
> --- a/recipes-kernel/linux/linux-wandboard.inc
> +++ b/recipes-kernel/linux/linux-wandboard.inc
> @@ -13,8 +13,12 @@ SCMVERSION ?= "y"
> 
>  SRCBRANCH ??= "master"
> 
> +# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
> +repository easier WANDBOARD_GITHUB_MIRROR ?=
> +"git://github.com/wandboard-org/linux.git"
> +

I hope these lines are messed because I´m using outlook.

Where is WANDBOARD_GITHUB_MIRROR defined? (I hope in next patch)



Daiane
>  # SRC_URI for wandboard kernel
> -SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
> +SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
>             file://defconfig \
>  "
> 
> diff --git a/recipes-kernel/linux/linux-wandboard_3.10.17.bb b/recipes-
> kernel/linux/linux-wandboard_3.10.17.bb
> index 71365e6..db54972 100644
> --- a/recipes-kernel/linux/linux-wandboard_3.10.17.bb
> +++ b/recipes-kernel/linux/linux-wandboard_3.10.17.bb
> @@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-dtb.inc
>  DEPENDS += "lzop-native bc-native"
> 
>  # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git -
> SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"
> -SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
> +SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
> +SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
>  LOCALVERSION = "-1.0.0-wandboard"
> 
> 
> --
> 1.7.9.5
> 
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
>
John Weber - Feb. 28, 2014, 12:57 p.m.
On 2/28/14, 6:49 AM, Daiane.Angolini@freescale.com wrote:
>
>> -----Original Message-----
>> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
>> bounces@yoctoproject.org] On Behalf Of John Weber
>> Sent: Thursday, February 27, 2014 11:38 PM
>> To: meta-freescale@yoctoproject.org
>> Subject: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2] linux-wandboard
>> (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH
>>
>> The following changes are made:
>> - Update SRCREV to 95f32b7
>> - Switch SRCBRANCH to the _test branch
>> - Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in
>>    local.conf
>>
>> squash this
> Squash this?
Otavio caught this as well.  I missed this when squashing patches using rebase 
-i.  I'll fix in V2.
>
>> Signed-off-by: John Weber <rjohnweber@gmail.com>
>> ---
>>   recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
>>   recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
>>   2 files changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-
>> kernel/linux/linux-wandboard.inc
>> index 57e5517..8a6e011 100644
>> --- a/recipes-kernel/linux/linux-wandboard.inc
>> +++ b/recipes-kernel/linux/linux-wandboard.inc
>> @@ -13,8 +13,12 @@ SCMVERSION ?= "y"
>>
>>   SRCBRANCH ??= "master"
>>
>> +# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
>> +repository easier WANDBOARD_GITHUB_MIRROR ?=
>> +"git://github.com/wandboard-org/linux.git"
>> +
> I hope these lines are messed because I´m using outlook.
>
> Where is WANDBOARD_GITHUB_MIRROR defined? (I hope in next patch)
>
Here is the change that is in the patch:

+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of
+# local repository easier
+WANDBOARD_GITHUB_MIRROR ?="git://github.com/wandboard-org/linux.git"
+

Not sure how this was changed in your email reader?
>
> Daiane
>>   # SRC_URI for wandboard kernel
>> -SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
>> +SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
>>              file://defconfig \
>>   "
>>
>> diff --git a/recipes-kernel/linux/linux-wandboard_3.10.17.bb b/recipes-
>> kernel/linux/linux-wandboard_3.10.17.bb
>> index 71365e6..db54972 100644
>> --- a/recipes-kernel/linux/linux-wandboard_3.10.17.bb
>> +++ b/recipes-kernel/linux/linux-wandboard_3.10.17.bb
>> @@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-dtb.inc
>>   DEPENDS += "lzop-native bc-native"
>>
>>   # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git -
>> SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"
>> -SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
>> +SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
>> +SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
>>   LOCALVERSION = "-1.0.0-wandboard"
>>
>>
>> --
>> 1.7.9.5
>>
>> _______________________________________________
>> meta-freescale mailing list
>> meta-freescale@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-freescale
>>
Daiane Angolini - Feb. 28, 2014, 1:09 p.m.
> -----Original Message-----
> From: John Weber [mailto:rjohnweber@gmail.com]
> Sent: Friday, February 28, 2014 9:57 AM
> To: Angolini Daiane-B19406; meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2] linux-
> wandboard (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH
> 
> 
> On 2/28/14, 6:49 AM, Daiane.Angolini@freescale.com wrote:
> >
> >> -----Original Message-----
> >> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> >> bounces@yoctoproject.org] On Behalf Of John Weber
> >> Sent: Thursday, February 27, 2014 11:38 PM
> >> To: meta-freescale@yoctoproject.org
> >> Subject: [meta-freescale] [meta-fsl-arm-extra][PATCH 1/2]
> >> linux-wandboard
> >> (3.10.17): Bump SRCREV to 95f32b7 and change SRCBRANCH
> >>
> >> The following changes are made:
> >> - Update SRCREV to 95f32b7
> >> - Switch SRCBRANCH to the _test branch
> >> - Set the git URI in WANDBOARD_GITHUB_MIRROR to allow overide in
> >>    local.conf
> >>
> >> squash this
> > Squash this?
> Otavio caught this as well.  I missed this when squashing patches using
> rebase -i.  I'll fix in V2.
> >
> >> Signed-off-by: John Weber <rjohnweber@gmail.com>
> >> ---
> >>   recipes-kernel/linux/linux-wandboard.inc        |    6 +++++-
> >>   recipes-kernel/linux/linux-wandboard_3.10.17.bb |    4 ++--
> >>   2 files changed, 7 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-
> >> kernel/linux/linux-wandboard.inc index 57e5517..8a6e011 100644
> >> --- a/recipes-kernel/linux/linux-wandboard.inc
> >> +++ b/recipes-kernel/linux/linux-wandboard.inc
> >> @@ -13,8 +13,12 @@ SCMVERSION ?= "y"
> >>
> >>   SRCBRANCH ??= "master"
> >>
> >> +# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
> >> +repository easier WANDBOARD_GITHUB_MIRROR ?=
> >> +"git://github.com/wandboard-org/linux.git"
> >> +
> > I hope these lines are messed because I´m using outlook.
> >
> > Where is WANDBOARD_GITHUB_MIRROR defined? (I hope in next patch)
> >
> Here is the change that is in the patch:
> 
> +# Allow override of WANDBOARD_GITHUB_MIRROR to make use of # local
> +repository easier WANDBOARD_GITHUB_MIRROR
> +?="git://github.com/wandboard-org/linux.git"
> +
> 
Outlook is super reliable! (#not)

This is true patch:
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of
+# local repository easier
+WANDBOARD_GITHUB_MIRROR ?= "git://github.com/wandboard-org/linux.git"
+

And now I see the variable definition ;)

Daiane
> Not sure how this was changed in your email reader?
> >
> > Daiane
> >>   # SRC_URI for wandboard kernel
> >> -SRC_URI =
> >> "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
> >> +SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
> >>              file://defconfig \
> >>   "
> >>
> >> diff --git a/recipes-kernel/linux/linux-wandboard_3.10.17.bb
> >> b/recipes- kernel/linux/linux-wandboard_3.10.17.bb
> >> index 71365e6..db54972 100644
> >> --- a/recipes-kernel/linux/linux-wandboard_3.10.17.bb
> >> +++ b/recipes-kernel/linux/linux-wandboard_3.10.17.bb
> >> @@ -7,8 +7,8 @@ require recipes-kernel/linux/linux-dtb.inc
> >>   DEPENDS += "lzop-native bc-native"
> >>
> >>   # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git
> >> - SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"
> >> -SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
> >> +SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
> >> +SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
> >>   LOCALVERSION = "-1.0.0-wandboard"
> >>
> >>
> >> --
> >> 1.7.9.5
> >>
> >> _______________________________________________
> >> meta-freescale mailing list
> >> meta-freescale@yoctoproject.org
> >> https://lists.yoctoproject.org/listinfo/meta-freescale
> >>
> 
>

Patch

diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-kernel/linux/linux-wandboard.inc
index 57e5517..8a6e011 100644
--- a/recipes-kernel/linux/linux-wandboard.inc
+++ b/recipes-kernel/linux/linux-wandboard.inc
@@ -13,8 +13,12 @@  SCMVERSION ?= "y"
 
 SRCBRANCH ??= "master"
 
+# Allow override of WANDBOARD_GITHUB_MIRROR to make use of
+# local repository easier
+WANDBOARD_GITHUB_MIRROR ?= "git://github.com/wandboard-org/linux.git"
+
 # SRC_URI for wandboard kernel
-SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
+SRC_URI = "${WANDBOARD_GITHUB_MIRROR};branch=${SRCBRANCH} \
            file://defconfig \
 "
 
diff --git a/recipes-kernel/linux/linux-wandboard_3.10.17.bb b/recipes-kernel/linux/linux-wandboard_3.10.17.bb
index 71365e6..db54972 100644
--- a/recipes-kernel/linux/linux-wandboard_3.10.17.bb
+++ b/recipes-kernel/linux/linux-wandboard_3.10.17.bb
@@ -7,8 +7,8 @@  require recipes-kernel/linux/linux-dtb.inc
 DEPENDS += "lzop-native bc-native"
 
 # Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git
-SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"
-SRCREV = "319845263e5483ee2fd2b3ddcf4e969cbbb5ffd4"
+SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta_test"
+SRCREV = "95f32b732fa4a1f5a497494ea2ba7d2e3b65d6c0"
 LOCALVERSION = "-1.0.0-wandboard"