rt-tests: Add src/backfire to FILES_${PN}

PATCH In review Darren Hart 3 participants 13 messages Mar 15, 2012 – Mar 16, 2012

lore

Share & tools

lore

Darren Hart

author

2012-03-15 22:09 UTC #0 lore raw

cover rt-tests: Add src/backfire to FILES_${PN}

The following changes since commit d4f1ef6b8297826230a68e535098709d07de1f48:

qt4: package static libraries correctly to fix warnings (2012-03-15 13:33:37 +0000)

are available in the git repository at:
git://git.yoctoproject.org/user-contrib/dvhart/oe-core dvhart/updates
http://git.yoctoproject.org/cgit.cgi/user-contrib/dvhart/oe-core/log/?h=dvhart/updates

Darren Hart (1):
rt-tests: Add src/backfire to FILES_${PN}

 meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Signature · 1 line

1.7.5.4

Darren Hart

author

2012-03-15 22:09 UTC #1 lore raw

PATCH 1/1 rt-tests: Add src/backfire to FILES_${PN}

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 <[email protected]>

---
 meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

meta/recipes-rt/rt-tests/rt-tests_0.83.bb +3 -0

index 78d51b3..6425027 100644
@@ -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"

Signature · 1 line

1.7.5.4

Saul Wold

2012-03-16 03:44 UTC #11 lore raw

In reply to Darren Hart

Quoted 8 lines · Darren Hart

The following changes since commit d4f1ef6b8297826230a68e535098709d07de1f48:
qt4: package static libraries correctly to fix warnings (2012-03-15 13:33:37 +0000)
are available in the git repository at:
git://git.yoctoproject.org/user-contrib/dvhart/oe-core dvhart/updates
http://git.yoctoproject.org/cgit.cgi/user-contrib/dvhart/oe-core/log/?h=dvhart/updates

Not sure what's going on here, but this is always harder for me to get to then the standard contrib branches.

It turns out it really dvhart/dvhart/updates, not dvhart/updates

Sau!

Quoted 6 lines

Darren Hart (1):

   rt-tests: Add src/backfire to FILES_${PN}

  meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)

Darren Hart

author

2012-03-16 05:42 UTC #12 lore raw

Quoted 5 lines · Saul Wold

Quoted 4 lines · Darren Hart
The following changes since commit d4f1ef6b8297826230a68e535098709d07de1f48:
qt4: package static libraries correctly to fix warnings (2012-03-15 13:33:37 +0000)

Quoted 8 lines

Quoted 4 lines
are available in the git repository at:
git://git.yoctoproject.org/user-contrib/dvhart/oe-core dvhart/updates
http://git.yoctoproject.org/cgit.cgi/user-contrib/dvhart/oe-core/log/?h=dvhart/updates
Not sure what's going on here, but this is always harder for me to get to then the standard contrib branches.
It turns out it really dvhart/dvhart/updates, not dvhart/updates

No, the branch is dvhart/updates:

$ git clone git://git.yoctoproject.org/user-contrib/dvhart/oe-core -b dvhart/updates
$ cd oe-core
$ git show HEAD
commit 5ca651eb19c3fcb64de2ce405de0bc7fa2a8c90b
Author: Darren Hart <[email protected]>
Date:   Thu Mar 15 14:51:22 2012 -0700

    rt-tests: Add src/backfire to FILES_${PN}

...

So I wonder what you are seeing? Maybe you call the new remote "dvhart" ? If so, then yes, you would refer to the commit as remote/branch which would be dvhart/dvhart/updates. So yeah, I don't need the dvhart in the branch name since this is a personal repo... just an old habit.

I also see that I haven't got this made public yet. I'll fix that.

--
Darren

Quoted 9 lines

Sau!

Quoted 6 lines

Darren Hart (1):

   rt-tests: Add src/backfire to FILES_${PN}

  meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Darren Hart

author

2012-03-16 15:42 UTC #2 lore raw

In reply to Darren Hart

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

Quoted 40 lines · Darren Hart

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 <[email protected]>
---
 meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +3 -0
index 78d51b3..6425027 100644
@@ -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"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Darren Hart

author

2012-03-16 16:05 UTC #3 lore raw

Quoted 5 lines · Darren Hart

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

Quoted 46 lines

--
Darren
Quoted 40 lines · Darren Hart
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 <[email protected]>
---
 meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +3 -0
index 78d51b3..6425027 100644
@@ -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"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Saul Wold

2012-03-16 16:15 UTC #8 lore raw

In reply to Darren Hart

Quoted 35 lines · Darren Hart

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<[email protected]>
---
  meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +1 -0
index 78d51b3..6425027 100644
@@ -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"
 

meta/recipes-rt/rt-tests/rt-tests_0.83.bb do_install() { · line 30

Quoted 5 lines

meta/recipes-rt/rt-tests/rt-tests_0.83.bb +2 -0

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

author

2012-03-16 16:26 UTC #9 lore raw

Quoted 43 lines · Saul Wold

Quoted 35 lines · Darren Hart
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<[email protected]>
---
  meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +1 -0
index 78d51b3..6425027 100644
@@ -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"
 
meta/recipes-rt/rt-tests/rt-tests_0.83.bb do_install() { · line 30
Quoted 5 lines
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +2 -0
@@ -25,3 +26,5 @@ do_install() {
          oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
                             INCLUDEDIR=${includedir}
  }
+
+FILES_${PN} += "${prefix}/src/backfire"
Darren,

Quoted 2 lines

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}" ?

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Richard Purdie

2012-03-16 16:33 UTC #10 lore raw

In reply to Saul Wold

Quoted 43 lines · Saul Wold

Quoted 35 lines · Darren Hart
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<[email protected]>
---
  meta/recipes-rt/rt-tests/rt-tests_0.83.bb |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +1 -0
index 78d51b3..6425027 100644
@@ -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"
 
meta/recipes-rt/rt-tests/rt-tests_0.83.bb do_install() { · line 30
Quoted 5 lines
meta/recipes-rt/rt-tests/rt-tests_0.83.bb +2 -0
@@ -25,3 +26,5 @@ do_install() {
          oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
                             INCLUDEDIR=${includedir}
  }
+
+FILES_${PN} += "${prefix}/src/backfire"
Darren,

Quoted 2 lines

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

2012-03-16 16:34 UTC #4 lore raw

In reply to Darren Hart

Quoted 10 lines · Darren Hart

Quoted 5 lines · Darren Hart
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.

Quoted 7 lines

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

author

2012-03-16 16:38 UTC #5 lore raw

Quoted 15 lines · Richard Purdie

Quoted 14 lines · Darren Hart
Quoted 5 lines · Darren Hart
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?

Quoted 7 lines

Quoted 3 lines
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 "/*".

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Richard Purdie

2012-03-16 17:20 UTC #6 lore raw

Quoted 21 lines · Darren Hart

Quoted 19 lines · Richard Purdie
Quoted 17 lines · Darren Hart
Quoted 5 lines · Darren Hart
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.

Quoted 6 lines

Quoted 3 lines
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

author

2012-03-16 18:08 UTC #7 lore raw

Quoted 26 lines · Richard Purdie

Quoted 25 lines · Darren Hart
Quoted 22 lines · Richard Purdie
Quoted 10 lines · Darren Hart
Quoted 5 lines · Darren Hart
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.
Quoted 7 lines
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.

Quoted 8 lines

Quoted 2 lines
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.

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel