Patchwork [1/4] linux-libc-headers-yocto: Do not include linux-yocto

login
register
mail settings
Submitter Darren Hart
Date June 29, 2012, 4:17 a.m.
Message ID <4263ffefaa6f3b0069bc41c0f7578d36717edcfc.1340942930.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/30857/
State New
Headers show

Comments

Darren Hart - June 29, 2012, 4:17 a.m.
The only bit we seem to need from the linux-yocto include is the
SRCREV_FORMAT. If we define this explicitly, we can avoid including the
linux-yocto include.

This is desirable so that linux-yocto can require kernel and simplify
the PR update process of all the linux-yocto* recipes. Pulling in
kernel to the linux-libc-headers-yocto recipes causes build failures by
pulling in "update-modules-nativesdk".

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
---
 .../linux-libc-headers/linux-libc-headers-yocto_git.bb              |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Bruce Ashfield - June 29, 2012, 1:02 p.m.
On Fri, Jun 29, 2012 at 12:17 AM, Darren Hart <dvhart@linux.intel.com> wrote:
> The only bit we seem to need from the linux-yocto include is the
> SRCREV_FORMAT. If we define this explicitly, we can avoid including the
> linux-yocto include.
>
> This is desirable so that linux-yocto can require kernel and simplify
> the PR update process of all the linux-yocto* recipes. Pulling in
> kernel to the linux-libc-headers-yocto recipes causes build failures by
> pulling in "update-modules-nativesdk".

I'm familiar with this particular issue .. and I've tried to fix it
myself (I have
something that does largely work with both kernel and kernel yocto
included), but I didn't know you were looking into this, so I'll toss
that out :)

There's something missing with this change, that I had restored the ability
to patch and modify the tree, but I'll bolt that on later when I fix up those
nativesdk parts.

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

>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> CC: Bruce Ashfield <bruce.ashfield@windriver.com>
> CC: Tom Zanussi <tom.zanussi@intel.com>
> ---
>  .../linux-libc-headers/linux-libc-headers-yocto_git.bb              |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
> index b4222f1..8ab4fb1 100644
> --- a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
> +++ b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
> @@ -1,5 +1,4 @@
>  require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
> -include recipes-kernel/linux/linux-yocto.inc
>
>  B = "${S}"
>
> @@ -13,6 +12,8 @@ SRCREV = "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
>  PV = "3.4+git-${SRCPV}"
>  PR = "r6"
>
> +SRCREV_FORMAT ?= "meta_machine"
> +
>  SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
>
>  # force this to empty to prevent installation failures, we aren't
> --
> 1.7.10.2
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
Darren Hart - June 29, 2012, 1:37 p.m.
On 06/29/2012 06:02 AM, Bruce Ashfield wrote:
> On Fri, Jun 29, 2012 at 12:17 AM, Darren Hart <dvhart@linux.intel.com> wrote:
>> The only bit we seem to need from the linux-yocto include is the
>> SRCREV_FORMAT. If we define this explicitly, we can avoid including the
>> linux-yocto include.
>>
>> This is desirable so that linux-yocto can require kernel and simplify
>> the PR update process of all the linux-yocto* recipes. Pulling in
>> kernel to the linux-libc-headers-yocto recipes causes build failures by
>> pulling in "update-modules-nativesdk".
> 
> I'm familiar with this particular issue .. and I've tried to fix it
> myself (I have
> something that does largely work with both kernel and kernel yocto
> included), but I didn't know you were looking into this, so I'll toss
> that out :)

I wasn't looking at it explicitly, but it got in the way of the
kernel-headers effort, so it grew out of that.

> 
> There's something missing with this change, that I had restored the ability
> to patch and modify the tree, but I'll bolt that on later when I fix up those
> nativesdk parts.

Cool, thanks!

> 
> Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> 
>>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> CC: Bruce Ashfield <bruce.ashfield@windriver.com>
>> CC: Tom Zanussi <tom.zanussi@intel.com>
>> ---
>>  .../linux-libc-headers/linux-libc-headers-yocto_git.bb              |    3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
>> index b4222f1..8ab4fb1 100644
>> --- a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
>> +++ b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
>> @@ -1,5 +1,4 @@
>>  require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
>> -include recipes-kernel/linux/linux-yocto.inc
>>
>>  B = "${S}"
>>
>> @@ -13,6 +12,8 @@ SRCREV = "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
>>  PV = "3.4+git-${SRCPV}"
>>  PR = "r6"
>>
>> +SRCREV_FORMAT ?= "meta_machine"
>> +
>>  SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
>>
>>  # force this to empty to prevent installation failures, we aren't
>> --
>> 1.7.10.2
>>
>> _______________________________________________
>> poky mailing list
>> poky@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/poky
> 
> 
>

Patch

diff --git a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
index b4222f1..8ab4fb1 100644
--- a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
+++ b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
@@ -1,5 +1,4 @@ 
 require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
-include recipes-kernel/linux/linux-yocto.inc
 
 B = "${S}"
 
@@ -13,6 +12,8 @@  SRCREV = "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
 PV = "3.4+git-${SRCPV}"
 PR = "r6"
 
+SRCREV_FORMAT ?= "meta_machine"
+
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
 # force this to empty to prevent installation failures, we aren't