Patchwork linux-yocto-custom: Use SRCREV_machine

login
register
mail settings
Submitter Darren Hart
Date March 14, 2014, 9:15 p.m.
Message ID <0b46d38b8e08d22c308a49d3ccb96ae9c8f14121.1394831720.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/68675/
State New
Headers show

Comments

Darren Hart - March 14, 2014, 9:15 p.m.
The Yocto kernel tools look for SRCREV_machine in do_validate_branches,
if it's empty, it just returns and silently continues. This likely needs
at least a warning. However, this recipe should be using SRCREV_machine,
and not just SRCREV.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Reported-by: Saul Wold <sgw@linux.intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-kernel/linux/linux-yocto-custom.bb     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Bruce Ashfield - March 15, 2014, 3:51 a.m.
On Fri, Mar 14, 2014 at 5:15 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> The Yocto kernel tools look for SRCREV_machine in do_validate_branches,
> if it's empty, it just returns and silently continues. This likely needs
> at least a warning. However, this recipe should be using SRCREV_machine,
> and not just SRCREV.

I can't think of anything that breaks with this .. but my spidey
senses are tingling.

This log should tell us what actually broke in the end ? What failed
to build / work
or otherwise explode ?

Bruce

>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> Reported-by: Saul Wold <sgw@linux.intel.com>
> Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  .../recipes-kernel/linux/linux-yocto-custom.bb     |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> index 4115d2f..42162f3 100644
> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> @@ -54,7 +54,7 @@ LINUX_VERSION_EXTENSION ?= "-custom"
>  # Override SRCREV to point to a different commit in a bbappend file to
>  # build a different release of the Linux kernel.
>  # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
> -SRCREV="76e10d158efb6d4516018846f60c2ab5501900bc"
> +SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>
>  PR = "r1"
>  PV = "${LINUX_VERSION}+git${SRCPV}"
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Darren Hart - March 15, 2014, 4:42 a.m.
On 3/14/14, 20:51, "Bruce Ashfield" <bruce.ashfield@gmail.com> wrote:

>On Fri, Mar 14, 2014 at 5:15 PM, Darren Hart <dvhart@linux.intel.com>
>wrote:
>> The Yocto kernel tools look for SRCREV_machine in do_validate_branches,
>> if it's empty, it just returns and silently continues. This likely needs
>> at least a warning. However, this recipe should be using SRCREV_machine,
>> and not just SRCREV.

Saul had a recipe using Linus' git tree and an old rev in master. It
worked in 1.3, but not in 1.5. He found that without setting
SRCREV_machine specifically, the wrong SRCREV would be checked out, and
the subsequent patches would fail to apply. Saul can provide specifics.
Happy to have this wait until we've spelled it out correctly.

--
Darren

>
>I can't think of anything that breaks with this .. but my spidey
>senses are tingling.
>
>This log should tell us what actually broke in the end ? What failed
>to build / work
>or otherwise explode ?
>
>Bruce
>
>>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> Reported-by: Saul Wold <sgw@linux.intel.com>
>> Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>>  .../recipes-kernel/linux/linux-yocto-custom.bb     |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>> index 4115d2f..42162f3 100644
>> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>> @@ -54,7 +54,7 @@ LINUX_VERSION_EXTENSION ?= "-custom"
>>  # Override SRCREV to point to a different commit in a bbappend file to
>>  # build a different release of the Linux kernel.
>>  # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
>> -SRCREV="76e10d158efb6d4516018846f60c2ab5501900bc"
>> +SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>>
>>  PR = "r1"
>>  PV = "${LINUX_VERSION}+git${SRCPV}"
>> --
>> 1.7.9.5
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
>-- 
>"Thou shalt not follow the NULL pointer, for chaos and madness await
>thee at its end"
>
Bruce Ashfield - March 15, 2014, 4:47 a.m.
On Sat, Mar 15, 2014 at 12:42 AM, Darren Hart <dvhart@linux.intel.com> wrote:
> On 3/14/14, 20:51, "Bruce Ashfield" <bruce.ashfield@gmail.com> wrote:
>
>>On Fri, Mar 14, 2014 at 5:15 PM, Darren Hart <dvhart@linux.intel.com>
>>wrote:
>>> The Yocto kernel tools look for SRCREV_machine in do_validate_branches,
>>> if it's empty, it just returns and silently continues. This likely needs
>>> at least a warning. However, this recipe should be using SRCREV_machine,
>>> and not just SRCREV.
>
> Saul had a recipe using Linus' git tree and an old rev in master. It
> worked in 1.3, but not in 1.5. He found that without setting
> SRCREV_machine specifically, the wrong SRCREV would be checked out, and
> the subsequent patches would fail to apply. Saul can provide specifics.
> Happy to have this wait until we've spelled it out correctly.

ok, that sounds plausible.

he change looks fine to me, since every other kernel user of the kernel-yocto
machine_meta SRCREV has machine properly specified, this one should
as well ..regardless of what was happening.

So consider this Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Bruce

>
> --
> Darren
>
>>
>>I can't think of anything that breaks with this .. but my spidey
>>senses are tingling.
>>
>>This log should tell us what actually broke in the end ? What failed
>>to build / work
>>or otherwise explode ?
>>
>>Bruce
>>
>>>
>>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>>> Reported-by: Saul Wold <sgw@linux.intel.com>
>>> Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> ---
>>>  .../recipes-kernel/linux/linux-yocto-custom.bb     |    2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>>b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>> index 4115d2f..42162f3 100644
>>> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>> @@ -54,7 +54,7 @@ LINUX_VERSION_EXTENSION ?= "-custom"
>>>  # Override SRCREV to point to a different commit in a bbappend file to
>>>  # build a different release of the Linux kernel.
>>>  # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
>>> -SRCREV="76e10d158efb6d4516018846f60c2ab5501900bc"
>>> +SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>>>
>>>  PR = "r1"
>>>  PV = "${LINUX_VERSION}+git${SRCPV}"
>>> --
>>> 1.7.9.5
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>>
>>--
>>"Thou shalt not follow the NULL pointer, for chaos and madness await
>>thee at its end"
>>
>
>
>

Patch

diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
index 4115d2f..42162f3 100644
--- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
@@ -54,7 +54,7 @@  LINUX_VERSION_EXTENSION ?= "-custom"
 # Override SRCREV to point to a different commit in a bbappend file to
 # build a different release of the Linux kernel.
 # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
-SRCREV="76e10d158efb6d4516018846f60c2ab5501900bc"
+SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"