summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-09-08 15:48:31 +0100
committerJoshua Lock <josh@linux.intel.com>2010-09-08 16:42:52 +0100
commit8be5593777be3a6617791fc70e9aa47d54ca1676 (patch)
tree9131dcb0038499df8a535f432b773cc04492023a
parentfac3ca94a235aa4a5bcf12c66a6e02a42b2ce538 (diff)
downloadopenembedded-core-contrib-8be5593777be3a6617791fc70e9aa47d54ca1676.tar.gz
kernel.bbclass/linux-wrs: move definition of perf package to kernel class
By defining the perf package in the shared kernel class bitbake will be able to find the package provider even when the preferred kernel doesn't build perf, preventing dependency resolution failures. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/classes/kernel.bbclass5
-rw-r--r--meta/recipes-kernel/linux/linux-wrs_git.bb8
2 files changed, 5 insertions, 8 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 10e5c2a571..4c79a98039 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -501,3 +501,8 @@ do_deploy() {
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
addtask deploy before do_package after do_install
+
+# perf must be enabled in individual kernel recipes
+PACKAGES =+ "perf"
+FILES_perf = "${bindir}/* \
+ ${libexecdir}"
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index 4f134d4d88..2978ed95cb 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
@@ -126,14 +126,6 @@ addtask wrlinux_configcheck after do_configure before do_compile
inherit kernel
-# perf subpackage variables
-PROVIDES += perf
-
-PACKAGES =+ "perf"
-FILES_perf = "${bindir}/* \
- ${libexecdir}"
-
-
# perf tasks
addtask compile_perf after do_compile before do_install
addtask install_perf after do_install before do_package do_deploy