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>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 10e5c2a5710cad40d86f8fb15901c1cbd3aa1ffa..4c79a98039d014c9f00589366d0eee3a90c5d9a8 100644 (file)
--- 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 4f134d4d883cbee18b9bbacaa1fe15bf4a1f3303..2978ed95cbb59fa66b28fb615154fc0e3ad61462 100644 (file)
--- 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