Patchwork [1/2] perf: rename perf.inc to perf-features.inc

login
register
mail settings
Submitter tom.zanussi@linux.intel.com
Date March 8, 2013, 12:39 a.m.
Message ID <4293cea264609a122b9cc05831fe598fcb3ff677.1362702690.git.tom.zanussi@linux.intel.com>
Download mbox | patch
Permalink /patch/45685/
State New
Headers show

Comments

tom.zanussi@linux.intel.com - March 8, 2013, 12:39 a.m.
From: Tom Zanussi <tom.zanussi@linux.intel.com>

The contents of perf.inc are really specific to perf features and
shouldn't use the generic perf.inc name, which implies common recipe
code.  It's always confusing to open up this file and find out that's
not what it is.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 meta/recipes-kernel/perf/{perf.inc => perf-features.inc} | 0
 meta/recipes-kernel/perf/perf_3.4.bb                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/perf/{perf.inc => perf-features.inc} (100%)
tom.zanussi@linux.intel.com - March 8, 2013, 12:39 a.m.
From: Tom Zanussi <tom.zanussi@linux.intel.com>

There's nothing kernel-version-specific about the perf_3.4 recipe, so
it's actually misnamed and misleading now that it also gets used with
the 3.8 kernel.

Since the recipe isn't tied to a specific PV, and simply uses
whatever's in STAGING_KERNEL_DIR, there's no reason to add anything
else either to the bare PN, so just use that as the recipe name.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 meta/recipes-kernel/perf/{perf_3.4.bb => perf.bb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-kernel/perf/{perf_3.4.bb => perf.bb} (100%)

diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf.bb
similarity index 100%
rename from meta/recipes-kernel/perf/perf_3.4.bb
rename to meta/recipes-kernel/perf/perf.bb
Saul Wold - March 11, 2013, 11:54 p.m.
On 03/07/2013 04:39 PM, tom.zanussi@linux.intel.com wrote:
> From: Tom Zanussi <tom.zanussi@linux.intel.com>
>
> There's nothing kernel-version-specific about the perf_3.4 recipe, so
> it's actually misnamed and misleading now that it also gets used with
> the 3.8 kernel.
>
> Since the recipe isn't tied to a specific PV, and simply uses
> whatever's in STAGING_KERNEL_DIR, there's no reason to add anything
> else either to the bare PN, so just use that as the recipe name.
>
This did not quite work out correctly, since the package name has now 
gone backwards since the default PV for a recipe is 1.0 when nothing is 
set on the recipe file name.

Is there a way to sort this out such that it picks up an incrementing PV 
from the kernel recipe?

As it stands now, the PV has gone from 3.4 -> 1.0.

Thanks for looking after this.

Sau!

> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
> ---
>   meta/recipes-kernel/perf/{perf_3.4.bb => perf.bb} | 0
>   1 file changed, 0 insertions(+), 0 deletions(-)
>   rename meta/recipes-kernel/perf/{perf_3.4.bb => perf.bb} (100%)
>
> diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf.bb
> similarity index 100%
> rename from meta/recipes-kernel/perf/perf_3.4.bb
> rename to meta/recipes-kernel/perf/perf.bb
>
Richard Purdie - March 12, 2013, 6:39 p.m.
On Mon, 2013-03-11 at 16:54 -0700, Saul Wold wrote:
> On 03/07/2013 04:39 PM, tom.zanussi@linux.intel.com wrote:
> > From: Tom Zanussi <tom.zanussi@linux.intel.com>
> >
> > There's nothing kernel-version-specific about the perf_3.4 recipe, so
> > it's actually misnamed and misleading now that it also gets used with
> > the 3.8 kernel.
> >
> > Since the recipe isn't tied to a specific PV, and simply uses
> > whatever's in STAGING_KERNEL_DIR, there's no reason to add anything
> > else either to the bare PN, so just use that as the recipe name.
> >
> This did not quite work out correctly, since the package name has now 
> gone backwards since the default PV for a recipe is 1.0 when nothing is 
> set on the recipe file name.
> 
> Is there a way to sort this out such that it picks up an incrementing PV 
> from the kernel recipe?
> 
> As it stands now, the PV has gone from 3.4 -> 1.0.
> 
> Thanks for looking after this.

As a hint on how to do this we need to read the kernel version and then
set PKGV just prior to or at the start of do_package time.

The logs will show 1.0 as the version but the final packages will have
the kernel version.

Cheers,

Richard
Darren Hart - March 12, 2013, 8:24 p.m.
On 03/11/2013 04:54 PM, Saul Wold wrote:
> On 03/07/2013 04:39 PM, tom.zanussi@linux.intel.com wrote:
>> From: Tom Zanussi <tom.zanussi@linux.intel.com>
>>
>> There's nothing kernel-version-specific about the perf_3.4 recipe, so
>> it's actually misnamed and misleading now that it also gets used with
>> the 3.8 kernel.
>>
>> Since the recipe isn't tied to a specific PV, and simply uses
>> whatever's in STAGING_KERNEL_DIR, there's no reason to add anything
>> else either to the bare PN, so just use that as the recipe name.
>>
> This did not quite work out correctly, since the package name has now 
> gone backwards since the default PV for a recipe is 1.0 when nothing is 
> set on the recipe file name.
> 
> Is there a way to sort this out such that it picks up an incrementing PV 
> from the kernel recipe?
> 
> As it stands now, the PV has gone from 3.4 -> 1.0.
> 
> Thanks for looking after this.

This is what PE is for right? Sounds like we need an epoch bump.

--
Darren hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel

Patch

diff --git a/meta/recipes-kernel/perf/perf.inc b/meta/recipes-kernel/perf/perf-features.inc
similarity index 100%
rename from meta/recipes-kernel/perf/perf.inc
rename to meta/recipes-kernel/perf/perf-features.inc
diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf_3.4.bb
index 22feb46..3c49922 100644
--- a/meta/recipes-kernel/perf/perf_3.4.bb
+++ b/meta/recipes-kernel/perf/perf_3.4.bb
@@ -11,7 +11,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 PR = "r8"
 
-require perf.inc
+require perf-features.inc
 
 BUILDPERF_libc-uclibc = "no"