summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/linux/linux-tools.inc41
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.2.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb2
7 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
deleted file mode 100644
index 3b03c05167..0000000000
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ /dev/null
@@ -1,41 +0,0 @@
1# included by kernel recipes if they want to build/provide
2# perf functionality from their tree.
3
4BUILDPERF = "yes"
5BUILDPERF_libc-uclibc = "no"
6# perf requires binutils which is GPLv3 licensed, don't prevent the entire kernel
7# being built if GPLv3 is in INCOMPATIBLE_LICENSE
8python () {
9 if ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
10 # GPLv3, drop perf
11 d.setVar("BUILDPERF", "no")
12 d.setVar("PERFDEPENDS", "")
13}
14
15do_compile_perf () {
16 if [ "${BUILDPERF}" = "yes" ]; then
17 oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} NO_NEWT=1 NO_DWARF=1
18 fi
19}
20
21fakeroot do_install_perf () {
22 if [ "${BUILDPERF}" = "yes" ]; then
23 oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} DESTDIR=${D} install NO_NEWT=1 NO_DWARF=1
24 fi
25}
26
27
28# perf tasks
29addtask compile_perf after do_compile before do_install
30addtask install_perf after do_install before do_package
31
32do_compile_perf[umask] = "022"
33do_install_perf[umask] = "022"
34
35PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot"
36PERFDEPENDS_libc-uclibc = ""
37PERFRDEPENDS = "python perl elfutils"
38PERFRDEPENDS_libc-uclibc = ""
39
40do_compile_perf[depends] = "${PERFDEPENDS}"
41RDEPENDS_perf += "${PERFRDEPENDS}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index a39b9663e8..971d1a8901 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -27,5 +27,3 @@ KERNEL_FEATURES = "features/netfilter"
27KERNEL_FEATURES_append = " features/taskstats" 27KERNEL_FEATURES_append = " features/taskstats"
28KERNEL_FEATURES_append_qemux86 = " cfg/sound" 28KERNEL_FEATURES_append_qemux86 = " cfg/sound"
29KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 29KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
30
31require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index a07b27acfb..ada66b8a17 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -28,5 +28,3 @@ KERNEL_FEATURES = "features/netfilter"
28KERNEL_FEATURES_append = " features/taskstats" 28KERNEL_FEATURES_append = " features/taskstats"
29KERNEL_FEATURES_append_qemux86 = " cfg/sound" 29KERNEL_FEATURES_append_qemux86 = " cfg/sound"
30KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 30KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
31
32require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 81730ea085..52f2dd1d6c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -28,5 +28,3 @@ KERNEL_FEATURES = "features/netfilter"
28KERNEL_FEATURES_append = " features/taskstats" 28KERNEL_FEATURES_append = " features/taskstats"
29KERNEL_FEATURES_append_qemux86 = " cfg/sound" 29KERNEL_FEATURES_append_qemux86 = " cfg/sound"
30KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 30KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
31
32require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 440821ca94..5cdff95fdc 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -32,5 +32,3 @@ KERNEL_FEATURES = "features/netfilter"
32KERNEL_FEATURES_append = " features/taskstats" 32KERNEL_FEATURES_append = " features/taskstats"
33KERNEL_FEATURES_append_qemux86 = " cfg/sound" 33KERNEL_FEATURES_append_qemux86 = " cfg/sound"
34KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 34KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
35
36require linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index e6cf9bb678..3e4a9dded1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -32,5 +32,3 @@ KERNEL_FEATURES="features/netfilter"
32KERNEL_FEATURES_append=" features/taskstats" 32KERNEL_FEATURES_append=" features/taskstats"
33KERNEL_FEATURES_append_qemux86=" cfg/sound" 33KERNEL_FEATURES_append_qemux86=" cfg/sound"
34KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 34KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
35
36require linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index af6130df71..eb5e8888b7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -34,5 +34,3 @@ KERNEL_REVISION_CHECKING=""
34KERNEL_FEATURES="features/netfilter" 34KERNEL_FEATURES="features/netfilter"
35KERNEL_FEATURES_append_qemux86=" cfg/sound" 35KERNEL_FEATURES_append_qemux86=" cfg/sound"
36KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 36KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
37
38require recipes-kernel/linux/linux-tools.inc