diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-06-20 10:31:41 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 13:03:04 +0100 |
commit | d2270701924553b720001a8cf0c1c48921efe9c4 (patch) | |
tree | 81c29a8d4c541e526a23280dfb988060b4159969 /meta | |
parent | 6b9c19140cd3c75c9862b22febb17af59930d865 (diff) | |
download | poky-d2270701924553b720001a8cf0c1c48921efe9c4.tar.gz |
recipes-kernel: remove linux-tools.inc
perf has been moved to a standalone package, making linux-tools.inc
unecessary. It can now be removed and recipes that included it
updated.
(From OE-Core rev: b485f3e0e55ad62079ed0913970ff0620f4808ea)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-tools.inc | 41 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 2 |
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 | |||
4 | BUILDPERF = "yes" | ||
5 | BUILDPERF_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 | ||
8 | python () { | ||
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 | |||
15 | do_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 | |||
21 | fakeroot 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 | ||
29 | addtask compile_perf after do_compile before do_install | ||
30 | addtask install_perf after do_install before do_package | ||
31 | |||
32 | do_compile_perf[umask] = "022" | ||
33 | do_install_perf[umask] = "022" | ||
34 | |||
35 | PERFDEPENDS = "virtual/${MLPREFIX}libc:do_populate_sysroot ${MLPREFIX}elfutils:do_populate_sysroot ${MLPREFIX}binutils:do_populate_sysroot" | ||
36 | PERFDEPENDS_libc-uclibc = "" | ||
37 | PERFRDEPENDS = "python perl elfutils" | ||
38 | PERFRDEPENDS_libc-uclibc = "" | ||
39 | |||
40 | do_compile_perf[depends] = "${PERFDEPENDS}" | ||
41 | RDEPENDS_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" | |||
27 | KERNEL_FEATURES_append = " features/taskstats" | 27 | KERNEL_FEATURES_append = " features/taskstats" |
28 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" | 28 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" |
29 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" | 29 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" |
30 | |||
31 | require 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" | |||
28 | KERNEL_FEATURES_append = " features/taskstats" | 28 | KERNEL_FEATURES_append = " features/taskstats" |
29 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" | 29 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" |
30 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" | 30 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" |
31 | |||
32 | require 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" | |||
28 | KERNEL_FEATURES_append = " features/taskstats" | 28 | KERNEL_FEATURES_append = " features/taskstats" |
29 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" | 29 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" |
30 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" | 30 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" |
31 | |||
32 | require 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" | |||
32 | KERNEL_FEATURES_append = " features/taskstats" | 32 | KERNEL_FEATURES_append = " features/taskstats" |
33 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" | 33 | KERNEL_FEATURES_append_qemux86 = " cfg/sound" |
34 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" | 34 | KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" |
35 | |||
36 | require 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" | |||
32 | KERNEL_FEATURES_append=" features/taskstats" | 32 | KERNEL_FEATURES_append=" features/taskstats" |
33 | KERNEL_FEATURES_append_qemux86=" cfg/sound" | 33 | KERNEL_FEATURES_append_qemux86=" cfg/sound" |
34 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" | 34 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" |
35 | |||
36 | require 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="" | |||
34 | KERNEL_FEATURES="features/netfilter" | 34 | KERNEL_FEATURES="features/netfilter" |
35 | KERNEL_FEATURES_append_qemux86=" cfg/sound" | 35 | KERNEL_FEATURES_append_qemux86=" cfg/sound" |
36 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" | 36 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" |
37 | |||
38 | require recipes-kernel/linux/linux-tools.inc | ||