Patchwork [1/1] rt-tests: Add src/backfire to FILES_${PN}

login
register
mail settings
Submitter Darren Hart
Date March 15, 2012, 10 p.m.
Message ID <5ca651eb19c3fcb64de2ce405de0bc7fa2a8c90b.1331848750.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/23469/
State Accepted
Commit 04099ff7c1177b0d676591f3a5db86158738461f
Headers show

Comments

Darren Hart - March 15, 2012, 10 p.m.
Fixes [YOCTO #2114]

The rt-tests recipe was issuing the following WARNINGs:

WARNING: For recipe rt-tests, the following files/directories were installed
but not shipped in any package:
WARNING:   /usr/src
WARNING:   /usr/src/backfire
WARNING:   /usr/src/backfire/backfire.c
WARNING:   /usr/src/backfire/Makefile

Add ${prefix}/src/backfire to FILES_${PN} to include these files in the package.
These depend on the target kernel and are meant to be able to be rebuilt as
needed.  Ideally we would also build this module and include it with rt-tests or
the linux-yocto-rt kernel. For now, conform with the intent of the rt-tests
Makefile and avoid the WARNINGs.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Darren Hart - March 16, 2012, 3:33 p.m.
Hrm, this silences the warnings, but the backfire sources are not
installed on the rootfs....

Anyone see what is wrong with the below? Is there some magic that purges
/usr/src in a minimal build?

--
Darren

On 03/15/2012 03:00 PM, Darren Hart wrote:
> Fixes [YOCTO #2114]
> 
> The rt-tests recipe was issuing the following WARNINGs:
> 
> WARNING: For recipe rt-tests, the following files/directories were installed
> but not shipped in any package:
> WARNING:   /usr/src
> WARNING:   /usr/src/backfire
> WARNING:   /usr/src/backfire/backfire.c
> WARNING:   /usr/src/backfire/Makefile
> 
> Add ${prefix}/src/backfire to FILES_${PN} to include these files in the package.
> These depend on the target kernel and are meant to be able to be rebuilt as
> needed.  Ideally we would also build this module and include it with rt-tests or
> the linux-yocto-rt kernel. For now, conform with the intent of the rt-tests
> Makefile and avoid the WARNINGs.
> 
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> ---
>  meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> index 78d51b3..6425027 100644
> --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> @@ -11,6 +11,7 @@ SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
>  
>  # git -> 0.83 needs a PE bump
>  PE = "1"
> +PR = "r1"
>  
>  SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
>  
> @@ -25,3 +26,5 @@ do_install() {
>          oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
>                             INCLUDEDIR=${includedir}
>  }
> +
> +FILES_${PN} += "${prefix}/src/backfire"
Darren Hart - March 16, 2012, 3:55 p.m.
On 03/16/2012 08:33 AM, Darren Hart wrote:
> Hrm, this silences the warnings, but the backfire sources are not
> installed on the rootfs....
> 
> Anyone see what is wrong with the below? Is there some magic that purges
> /usr/src in a minimal build?

I was adding "/usr/src/backfire" to FILES_${PN}. It seems one should add
"/usr/src/backfire/*" to actually get the files.

However, I am surprised that the warnings went away and the files were
still not packaged when I used "/usr/src/backfire". Is this expected
behavior?

I have pushed the new version to the same branch using
"/usr/src/backfire/*". Built,booted,and verified on qemux86 using
core-image-rt.

--
Darren

> 
> --
> Darren
> 
> On 03/15/2012 03:00 PM, Darren Hart wrote:
>> Fixes [YOCTO #2114]
>>
>> The rt-tests recipe was issuing the following WARNINGs:
>>
>> WARNING: For recipe rt-tests, the following files/directories were installed
>> but not shipped in any package:
>> WARNING:   /usr/src
>> WARNING:   /usr/src/backfire
>> WARNING:   /usr/src/backfire/backfire.c
>> WARNING:   /usr/src/backfire/Makefile
>>
>> Add ${prefix}/src/backfire to FILES_${PN} to include these files in the package.
>> These depend on the target kernel and are meant to be able to be rebuilt as
>> needed.  Ideally we would also build this module and include it with rt-tests or
>> the linux-yocto-rt kernel. For now, conform with the intent of the rt-tests
>> Makefile and avoid the WARNINGs.
>>
>> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
>> ---
>>  meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> index 78d51b3..6425027 100644
>> --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> @@ -11,6 +11,7 @@ SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
>>  
>>  # git -> 0.83 needs a PE bump
>>  PE = "1"
>> +PR = "r1"
>>  
>>  SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
>>  
>> @@ -25,3 +26,5 @@ do_install() {
>>          oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
>>                             INCLUDEDIR=${includedir}
>>  }
>> +
>> +FILES_${PN} += "${prefix}/src/backfire"
>
Saul Wold - March 16, 2012, 4:06 p.m.
On 03/15/2012 03:00 PM, Darren Hart wrote:
> Fixes [YOCTO #2114]
>
> The rt-tests recipe was issuing the following WARNINGs:
>
> WARNING: For recipe rt-tests, the following files/directories were installed
> but not shipped in any package:
> WARNING:   /usr/src
> WARNING:   /usr/src/backfire
> WARNING:   /usr/src/backfire/backfire.c
> WARNING:   /usr/src/backfire/Makefile
>
> Add ${prefix}/src/backfire to FILES_${PN} to include these files in the package.
> These depend on the target kernel and are meant to be able to be rebuilt as
> needed.  Ideally we would also build this module and include it with rt-tests or
> the linux-yocto-rt kernel. For now, conform with the intent of the rt-tests
> Makefile and avoid the WARNINGs.
>
> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
> ---
>   meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> index 78d51b3..6425027 100644
> --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> @@ -11,6 +11,7 @@ SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
>
>   # git ->  0.83 needs a PE bump
>   PE = "1"
> +PR = "r1"
>
>   SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
>
> @@ -25,3 +26,5 @@ do_install() {
>           oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
>                              INCLUDEDIR=${includedir}
>   }
> +
> +FILES_${PN} += "${prefix}/src/backfire"
Darren,

I looked closer and you need you use ${D}${prefix}/src here instead, 
that will get you what you want.

Sau!
Darren Hart - March 16, 2012, 4:16 p.m.
On 03/16/2012 09:06 AM, Saul Wold wrote:
> On 03/15/2012 03:00 PM, Darren Hart wrote:
>> Fixes [YOCTO #2114]
>>
>> The rt-tests recipe was issuing the following WARNINGs:
>>
>> WARNING: For recipe rt-tests, the following files/directories were installed
>> but not shipped in any package:
>> WARNING:   /usr/src
>> WARNING:   /usr/src/backfire
>> WARNING:   /usr/src/backfire/backfire.c
>> WARNING:   /usr/src/backfire/Makefile
>>
>> Add ${prefix}/src/backfire to FILES_${PN} to include these files in the package.
>> These depend on the target kernel and are meant to be able to be rebuilt as
>> needed.  Ideally we would also build this module and include it with rt-tests or
>> the linux-yocto-rt kernel. For now, conform with the intent of the rt-tests
>> Makefile and avoid the WARNINGs.
>>
>> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
>> ---
>>   meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
>>   1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> index 78d51b3..6425027 100644
>> --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
>> @@ -11,6 +11,7 @@ SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
>>
>>   # git ->  0.83 needs a PE bump
>>   PE = "1"
>> +PR = "r1"
>>
>>   SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
>>
>> @@ -25,3 +26,5 @@ do_install() {
>>           oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
>>                              INCLUDEDIR=${includedir}
>>   }
>> +
>> +FILES_${PN} += "${prefix}/src/backfire"
> Darren,
> 
> I looked closer and you need you use ${D}${prefix}/src here instead, 
> that will get you what you want.


Hrm, that isn't consistent with the rest of the usage I see in oe-core:

$ git grep 'FILES_${PN}.*${prefix}'
classes/cross-canadian.bbclass:FILES_${PN} = "${prefix}"
classes/cross-canadian.bbclass:FILES_${PN}-dbg += "${prefix}/.debug \
recipes-devtools/binutils/binutils.inc:FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/
recipes-devtools/rpm/rpm_5.4.0.bb:FILES_${PN}-build = "${prefix}/src/rpm \
recipes-devtools/tcltk/tcl_8.5.11.bb:FILES_${PN} += "${prefix}/lib/tcl8.5 ${prefix}
recipes-sato/puzzles/puzzles_r9375.bb:FILES_${PN} = "${prefix}/games/* ${datadir}/a
recipes-sato/puzzles/puzzles_r9375.bb:FILES_${PN}-dbg += "${prefix}/games/.debug"

Also, it works as intended if I use "${prefix}/src/backfire/*" and this is
consistent with existing usage.

What lead you to suggest "${D}${prefix}" ?
Richard Purdie - March 16, 2012, 4:24 p.m.
On Fri, 2012-03-16 at 09:06 -0700, Saul Wold wrote:
> On 03/15/2012 03:00 PM, Darren Hart wrote:
> > Fixes [YOCTO #2114]
> >
> > The rt-tests recipe was issuing the following WARNINGs:
> >
> > WARNING: For recipe rt-tests, the following files/directories were installed
> > but not shipped in any package:
> > WARNING:   /usr/src
> > WARNING:   /usr/src/backfire
> > WARNING:   /usr/src/backfire/backfire.c
> > WARNING:   /usr/src/backfire/Makefile
> >
> > Add ${prefix}/src/backfire to FILES_${PN} to include these files in the package.
> > These depend on the target kernel and are meant to be able to be rebuilt as
> > needed.  Ideally we would also build this module and include it with rt-tests or
> > the linux-yocto-rt kernel. For now, conform with the intent of the rt-tests
> > Makefile and avoid the WARNINGs.
> >
> > Signed-off-by: Darren Hart<dvhart@linux.intel.com>
> > ---
> >   meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
> >   1 files changed, 3 insertions(+), 0 deletions(-)
> >
> > diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> > index 78d51b3..6425027 100644
> > --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> > +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> > @@ -11,6 +11,7 @@ SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
> >
> >   # git ->  0.83 needs a PE bump
> >   PE = "1"
> > +PR = "r1"
> >
> >   SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
> >
> > @@ -25,3 +26,5 @@ do_install() {
> >           oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
> >                              INCLUDEDIR=${includedir}
> >   }
> > +
> > +FILES_${PN} += "${prefix}/src/backfire"
> Darren,
> 
> I looked closer and you need you use ${D}${prefix}/src here instead, 
> that will get you what you want.

You should not need ${D} here...

Cheers,

Richard
Richard Purdie - March 16, 2012, 4:26 p.m.
On Fri, 2012-03-16 at 08:55 -0700, Darren Hart wrote:
> On 03/16/2012 08:33 AM, Darren Hart wrote:
> > Hrm, this silences the warnings, but the backfire sources are not
> > installed on the rootfs....
> > 
> > Anyone see what is wrong with the below? Is there some magic that purges
> > /usr/src in a minimal build?
> 
> I was adding "/usr/src/backfire" to FILES_${PN}. It seems one should add
> "/usr/src/backfire/*" to actually get the files.
> 
> However, I am surprised that the warnings went away and the files were
> still not packaged when I used "/usr/src/backfire". Is this expected
> behavior?
> 
> I have pushed the new version to the same branch using
> "/usr/src/backfire/*". Built,booted,and verified on qemux86 using
> core-image-rt.

FWIW with your original patch I'm seeing things being correctly packaged
in the main package (rt-tests) which is consistent with the warning
message being fixed.

Cheers,

Richard
Darren Hart - March 16, 2012, 4:28 p.m.
On 03/16/2012 09:26 AM, Richard Purdie wrote:
> On Fri, 2012-03-16 at 08:55 -0700, Darren Hart wrote:
>> On 03/16/2012 08:33 AM, Darren Hart wrote:
>>> Hrm, this silences the warnings, but the backfire sources are not
>>> installed on the rootfs....
>>>
>>> Anyone see what is wrong with the below? Is there some magic that purges
>>> /usr/src in a minimal build?
>>
>> I was adding "/usr/src/backfire" to FILES_${PN}. It seems one should add
>> "/usr/src/backfire/*" to actually get the files.
>>
>> However, I am surprised that the warnings went away and the files were
>> still not packaged when I used "/usr/src/backfire". Is this expected
>> behavior?
>>
>> I have pushed the new version to the same branch using
>> "/usr/src/backfire/*". Built,booted,and verified on qemux86 using
>> core-image-rt.
> 
> FWIW with your original patch I'm seeing things being correctly packaged
> in the main package (rt-tests) which is consistent with the warning
> message being fixed.

I see them appear in the rt-tests "package" dir, but not in the rootfs
unless I append the "/*".
Richard Purdie - March 16, 2012, 5:11 p.m.
On Fri, 2012-03-16 at 09:28 -0700, Darren Hart wrote:
> 
> On 03/16/2012 09:26 AM, Richard Purdie wrote:
> > On Fri, 2012-03-16 at 08:55 -0700, Darren Hart wrote:
> >> On 03/16/2012 08:33 AM, Darren Hart wrote:
> >>> Hrm, this silences the warnings, but the backfire sources are not
> >>> installed on the rootfs....
> >>>
> >>> Anyone see what is wrong with the below? Is there some magic that purges
> >>> /usr/src in a minimal build?
> >>
> >> I was adding "/usr/src/backfire" to FILES_${PN}. It seems one should add
> >> "/usr/src/backfire/*" to actually get the files.
> >>
> >> However, I am surprised that the warnings went away and the files were
> >> still not packaged when I used "/usr/src/backfire". Is this expected
> >> behavior?
> >>
> >> I have pushed the new version to the same branch using
> >> "/usr/src/backfire/*". Built,booted,and verified on qemux86 using
> >> core-image-rt.
> > 
> > FWIW with your original patch I'm seeing things being correctly packaged
> > in the main package (rt-tests) which is consistent with the warning
> > message being fixed.
> 
> I see them appear in the rt-tests "package" dir, but not in the rootfs
> unless I append the "/*".

If I view the contents of the rt-tests*.rpm in deploy/rpm/xxx/, I can
see the files listed. This is with current master.

Please check what you tested ;-)

Cheers,

Richard
Darren Hart - March 16, 2012, 5:59 p.m.
On 03/16/2012 10:11 AM, Richard Purdie wrote:
> On Fri, 2012-03-16 at 09:28 -0700, Darren Hart wrote:
>>
>> On 03/16/2012 09:26 AM, Richard Purdie wrote:
>>> On Fri, 2012-03-16 at 08:55 -0700, Darren Hart wrote:
>>>> On 03/16/2012 08:33 AM, Darren Hart wrote:
>>>>> Hrm, this silences the warnings, but the backfire sources are not
>>>>> installed on the rootfs....
>>>>>
>>>>> Anyone see what is wrong with the below? Is there some magic that purges
>>>>> /usr/src in a minimal build?
>>>>
>>>> I was adding "/usr/src/backfire" to FILES_${PN}. It seems one should add
>>>> "/usr/src/backfire/*" to actually get the files.
>>>>
>>>> However, I am surprised that the warnings went away and the files were
>>>> still not packaged when I used "/usr/src/backfire". Is this expected
>>>> behavior?
>>>>
>>>> I have pushed the new version to the same branch using
>>>> "/usr/src/backfire/*". Built,booted,and verified on qemux86 using
>>>> core-image-rt.
>>>
>>> FWIW with your original patch I'm seeing things being correctly packaged
>>> in the main package (rt-tests) which is consistent with the warning
>>> message being fixed.
>>
>> I see them appear in the rt-tests "package" dir, but not in the rootfs
>> unless I append the "/*".
> 
> If I view the contents of the rt-tests*.rpm in deploy/rpm/xxx/, I can
> see the files listed. This is with current master.
> 
> Please check what you tested ;-)
> 

I can't explain it, but the one in master (no "/*") is working correctly
per my last build.

Patch

diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
index 78d51b3..6425027 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
@@ -11,6 +11,7 @@  SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
 
 # git -> 0.83 needs a PE bump
 PE = "1"
+PR = "r1"
 
 SRC_URI = "git://github.com/clrkwllms/rt-tests.git"
 
@@ -25,3 +26,5 @@  do_install() {
         oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
                            INCLUDEDIR=${includedir}
 }
+
+FILES_${PN} += "${prefix}/src/backfire"