summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_tracking_fields.inc26
-rw-r--r--meta/conf/multilib.conf4
-rw-r--r--meta/recipes-core/tasks/task-core-tools-debug.bb26
-rw-r--r--meta/recipes-core/tasks/task-core-tools-profile.bb69
-rw-r--r--meta/recipes-core/tasks/task-core-tools-testapps.bb46
-rw-r--r--meta/recipes-core/tasks/task-core-tools.bb102
6 files changed, 164 insertions, 109 deletions
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 42f7e65a8f..09b5bfc276 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2467,12 +2467,26 @@ RECIPE_LATEST_RELEASE_DATE_pn-task-core-nfs="n/a"
2467RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a" 2467RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a"
2468RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu <dongxiao.xu@intel.com>" 2468RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu <dongxiao.xu@intel.com>"
2469 2469
2470RECIPE_STATUS_pn-task-core-tools="green" 2470RECIPE_STATUS_pn-task-core-tools-debug="green"
2471RECIPE_LATEST_VERSION_pn-task-core-tools="1.0" 2471RECIPE_LATEST_VERSION_pn-task-core-tools-debug="1.0"
2472RECIPE_NO_OF_PATCHES_pn-task-core-tools="0" 2472RECIPE_NO_OF_PATCHES_pn-task-core-tools-debug="0"
2473RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools="n/a" 2473RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-debug="n/a"
2474RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools="n/a" 2474RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-debug="n/a"
2475RECIPE_MAINTAINER_pn-task-core-tools = "Dongxiao Xu <dongxiao.xu@intel.com>" 2475RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu <dongxiao.xu@intel.com>"
2476
2477RECIPE_STATUS_pn-task-core-tools-profile="green"
2478RECIPE_LATEST_VERSION_pn-task-core-tools-profile="1.0"
2479RECIPE_NO_OF_PATCHES_pn-task-core-tools-profile="0"
2480RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-profile="n/a"
2481RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-profile="n/a"
2482RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu <dongxiao.xu@intel.com>"
2483
2484RECIPE_STATUS_pn-task-core-tools-testapps="green"
2485RECIPE_LATEST_VERSION_pn-task-core-tools-testapps="1.0"
2486RECIPE_NO_OF_PATCHES_pn-task-core-tools-testapps="0"
2487RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-testapps="n/a"
2488RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-testapps="n/a"
2489RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Dongxiao Xu <dongxiao.xu@intel.com>"
2476 2490
2477RECIPE_STATUS_pn-gst-meta-base="green" 2491RECIPE_STATUS_pn-gst-meta-base="green"
2478DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 Debian=gstreamer0.10" 2492DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 Debian=gstreamer0.10"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 9554519d31..d366fd326b 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -393,7 +393,9 @@ BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}"
393BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}" 393BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}"
394BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}" 394BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}"
395BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}" 395BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}"
396BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}" 396BBCLASSEXTEND_append_pn-task-core-tools-debug = " ${MULTILIBS}"
397BBCLASSEXTEND_append_pn-task-core-tools-profile = " ${MULTILIBS}"
398BBCLASSEXTEND_append_pn-task-core-tools-testapps = " ${MULTILIBS}"
397BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}" 399BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}"
398BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}" 400BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}"
399BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}" 401BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}"
diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/tasks/task-core-tools-debug.bb
new file mode 100644
index 0000000000..3c92f3f8f3
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-tools-debug.bb
@@ -0,0 +1,26 @@
1#
2# Copyright (C) 2008 OpenedHand Ltd.
3#
4
5DESCRIPTION = "Debug tools tasks for OE-Core"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9
10PACKAGES = "\
11 ${PN} \
12 ${PN}-dbg \
13 ${PN}-dev \
14 "
15
16PACKAGE_ARCH = "${MACHINE_ARCH}"
17
18ALLOW_EMPTY = "1"
19
20RDEPENDS_${PN} = "\
21 gdb \
22 gdbserver \
23 tcf-agent \
24 rsync \
25 strace \
26 "
diff --git a/meta/recipes-core/tasks/task-core-tools-profile.bb b/meta/recipes-core/tasks/task-core-tools-profile.bb
new file mode 100644
index 0000000000..254d3f5e48
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-tools-profile.bb
@@ -0,0 +1,69 @@
1#
2# Copyright (C) 2008 OpenedHand Ltd.
3#
4
5DESCRIPTION = "Profile tools tasks for OE-Core"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9
10PACKAGES = "\
11 ${PN} \
12 ${PN}-dbg \
13 ${PN}-dev \
14 "
15
16PACKAGE_ARCH = "${MACHINE_ARCH}"
17
18ALLOW_EMPTY = "1"
19
20RRECOMMENDS_${PN} = "\
21 perf \
22 trace-cmd \
23 kernel-module-oprofile \
24 blktrace \
25 sysprof \
26 "
27
28PROFILETOOLS = "\
29 oprofile \
30 oprofileui-server \
31 powertop \
32 latencytop \
33 lttng-control \
34 lttng-viewer"
35
36# systemtap needs elfutils which is not fully buildable on uclibc
37# hence we exclude it from uclibc based builds
38SYSTEMTAP = "systemtap"
39SYSTEMTAP_libc-uclibc = ""
40
41# lttng-ust uses sched_getcpu() which is not there on uclibc
42# for some of the architectures it can be patched to call the
43# syscall directly but for x86_64 __NR_getcpu is a vsyscall
44# which means we can not use syscall() to call it. So we ignore
45# it for x86_64/uclibc
46
47LTTNGUST = "lttng-ust"
48LTTNGUST_libc-uclibc = ""
49LTTNGUST_mips = ""
50
51# valgrind does not work on mips
52
53VALGRIND = "valgrind"
54VALGRIND_libc-uclibc = ""
55VALGRIND_mips = ""
56
57# exmap-console
58# exmap-server
59
60# At present we only build lttng-ust on
61# qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream liburcu
62# (which is required by lttng-ust) may not build on other platforms, like
63# MIPS.
64RDEPENDS_${PN} = "\
65 ${PROFILETOOLS} \
66 ${LTTNGUST} \
67 ${SYSTEMTAP} \
68 ${VALGRIND} \
69 "
diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb b/meta/recipes-core/tasks/task-core-tools-testapps.bb
new file mode 100644
index 0000000000..b5847f8b80
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-tools-testapps.bb
@@ -0,0 +1,46 @@
1#
2# Copyright (C) 2008 OpenedHand Ltd.
3#
4
5DESCRIPTION = "Test apps task for OE-Core"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9
10PACKAGES = "\
11 ${PN} \
12 ${PN}-dbg \
13 ${PN}-dev \
14 "
15
16PACKAGE_ARCH = "${MACHINE_ARCH}"
17
18ALLOW_EMPTY = "1"
19
20# kexec-tools doesn't work on Mips
21KEXECTOOLS ?= "kexec"
22KEXECTOOLS_mips ?= ""
23KEXECTOOLS_mipsel ?= ""
24KEXECTOOLS_powerpc ?= ""
25
26RDEPENDS_${PN} = "\
27 blktool \
28 fstests \
29 tslib-calibrate \
30 tslib-tests \
31 lrzsz \
32 ${KEXECTOOLS} \
33 alsa-utils-amixer \
34 alsa-utils-aplay \
35 owl-video \
36 gst-meta-video \
37 gst-meta-audio \
38 mesa-demos \
39 x11perf \
40 xrestop \
41 xwininfo \
42 xprop \
43 xvideo-tests \
44 clutter-box2d \
45 ltp \
46 "
diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb
deleted file mode 100644
index 1a42f15bdc..0000000000
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ /dev/null
@@ -1,102 +0,0 @@
1#
2# Copyright (C) 2008 OpenedHand Ltd.
3#
4
5DESCRIPTION = "Tools tasks for OE-Core"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r15"
10
11PACKAGES = "\
12 task-core-tools-debug \
13 task-core-tools-debug-dbg \
14 task-core-tools-debug-dev \
15 task-core-tools-profile \
16 task-core-tools-profile-dbg \
17 task-core-tools-profile-dev \
18 task-core-tools-testapps \
19 task-core-tools-testapps-dbg \
20 task-core-tools-testapps-dev \
21 "
22
23PACKAGE_ARCH = "${MACHINE_ARCH}"
24
25ALLOW_EMPTY = "1"
26
27# kexec-tools doesn't work on Mips
28KEXECTOOLS ?= "kexec"
29KEXECTOOLS_mips ?= ""
30KEXECTOOLS_mipsel ?= ""
31KEXECTOOLS_powerpc ?= ""
32
33RDEPENDS_task-core-tools-debug = "\
34 gdb \
35 gdbserver \
36 tcf-agent \
37 rsync \
38 strace"
39
40RDEPENDS_task-core-tools-profile = "\
41 oprofile \
42 oprofileui-server \
43 powertop \
44 latencytop \
45 lttng-control \
46 lttng-viewer"
47
48RRECOMMENDS_task-core-tools-profile = "\
49 perf \
50 trace-cmd \
51 kernel-module-oprofile \
52 blktrace \
53 sysprof \
54 "
55
56# systemtap needs elfutils which is not fully buildable on uclibc
57# hence we exclude it from uclibc based builds
58SYSTEMTAP = "systemtap"
59SYSTEMTAP_libc-uclibc = ""
60
61# lttng-ust uses sched_getcpu() which is not there on uclibc
62# for some of the architectures it can be patched to call the
63# syscall directly but for x86_64 __NR_getcpu is a vsyscall
64# which means we can not use syscall() to call it. So we ignore
65# it for x86_64/uclibc
66
67LTTNGUST = "lttng-ust"
68LTTNGUST_libc-uclibc = ""
69
70# exmap-console
71# exmap-server
72
73# At present we only build lttng-ust on
74# qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream liburcu
75# (which is required by lttng-ust) may not build on other platforms, like
76# MIPS.
77RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust ${SYSTEMTAP}"
78RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} ${SYSTEMTAP}"
79RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} ${SYSTEMTAP}"
80RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST} ${SYSTEMTAP}"
81
82RDEPENDS_task-core-tools-testapps = "\
83 blktool \
84 fstests \
85 tslib-calibrate \
86 tslib-tests \
87 lrzsz \
88 ${KEXECTOOLS} \
89 alsa-utils-amixer \
90 alsa-utils-aplay \
91 owl-video \
92 gst-meta-video \
93 gst-meta-audio \
94 mesa-demos \
95 x11perf \
96 xrestop \
97 xwininfo \
98 xprop \
99 xvideo-tests \
100 clutter-box2d \
101 ltp \
102 "