summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/conf/local.conf.sample27
-rw-r--r--meta/classes/poky-image.bbclass22
-rw-r--r--meta/packages/tasks/task-poky.bb54
3 files changed, 63 insertions, 40 deletions
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 92f49097b7..3c22e0a2f8 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -30,19 +30,20 @@ DISTRO ?= "poky"
30 30
31# IMAGE_FEATURES configuration of the generated images 31# IMAGE_FEATURES configuration of the generated images
32# (Some of these are automatically added to certain image types) 32# (Some of these are automatically added to certain image types)
33# "dev-pkgs" - add -dev packages for all installed packages 33# "dbg-pkgs" - add -dbg packages for all installed packages
34# (useful if you want to develop against libs in the image) 34# (adds symbol information for debugging/profiling)
35# "dbg-pkgs" - add -dbg packages for all installed packages 35# "dev-pkgs" - add -dev packages for all installed packages
36# (adds symbol information for debugging/profiling) 36# (useful if you want to develop against libs in the image)
37# "apps-core" - core applications 37# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.)
38# "apps-pda" - add PDA application suite (contacts, dates, etc.) 38# "tools-debug" - add debugging tools (gdb, strace)
39# "dev-tools" - add development tools (gcc, make, pkgconfig etc.) 39# "tools-profile" - add profiling tools (oprofile, exmap, lttng valgrind (x86 only))
40# "dbg-tools" - add debugging tools (gdb, strace, oprofile, etc.) 40# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
41# "test-tools" - add useful testing tools (ts_print, aplay, arecord etc.) 41# "debug-tweaks" - make an image for suitable of development
42# "debug-tweaks" - make an image for suitable of development 42# e.g. ssh root access has a blank password
43# e.g. ssh root access has a blank password 43# There are other application targets too, see meta/classes/poky-image.bbclass
44 44# and meta/packages/tasks/task-poky.bb for more details.
45IMAGE_FEATURES = "dbg-tools test-tools debug-tweaks" 45
46IMAGE_FEATURES = "tools-dbg tools-profile tools-testapps debug-tweaks"
46 47
47# A list of packaging systems used in generated images 48# A list of packaging systems used in generated images
48# The first package type listed will be used for rootfs generation 49# The first package type listed will be used for rootfs generation
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index aaeaee7ea6..1e868a76fb 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -51,17 +51,21 @@ DISTRO_TASKS += '\
51 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-poky-apps-x11-pimlico-dbg", "",d)} \ 51 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-poky-apps-x11-pimlico-dbg", "",d)} \
52 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-poky-apps-x11-pimlico-dev", "",d)} \ 52 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-poky-apps-x11-pimlico-dev", "",d)} \
53 \ 53 \
54 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-poky-sdk", "",d)} \ 54 ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-poky-tools-debug", "",d)} \
55 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \ 55 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-poky-tools-debug-dbg", "",d)} \
56 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-poky-sdk-dev", "",d)} \ 56 ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-poky-tools-debug-dev", "",d)} \
57 \ 57 \
58 ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-poky-devtools", "",d)} \ 58 ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-poky-tools-profile", "",d)} \
59 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-poky-devtools-dbg", "",d)} \ 59 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-poky-tools-profile-dbg", "",d)} \
60 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-poky-devtools-dev", "",d)} \ 60 ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-poky-tools-profile-dev", "",d)} \
61 \ 61 \
62 ${@base_contains("IMAGE_FEATURES", "test-tools", "task-poky-testapps", "",d)} \ 62 ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-poky-tools-testapps", "",d)} \
63 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-poky-testapps-dbg", "",d)} \ 63 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-poky-testapps-dbg", "",d)} \
64 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \ 64 ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \
65 \
66 ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-poky-sdk", "",d)} \
67 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \
68 ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-poky-sdk-dev", "",d)} \
65 \ 69 \
66 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ 70 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
67 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \ 71 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
diff --git a/meta/packages/tasks/task-poky.bb b/meta/packages/tasks/task-poky.bb
index f965e2ff74..a6ef9cfefb 100644
--- a/meta/packages/tasks/task-poky.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -3,7 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Tasks for OpenedHand Poky" 5DESCRIPTION = "Tasks for OpenedHand Poky"
6PR = "r4" 6PR = "r5"
7 7
8PACKAGES = "\ 8PACKAGES = "\
9 task-poky-apps-console \ 9 task-poky-apps-console \
@@ -24,12 +24,15 @@ PACKAGES = "\
24 task-poky-x11-sato \ 24 task-poky-x11-sato \
25 task-poky-x11-sato-dbg \ 25 task-poky-x11-sato-dbg \
26 task-poky-x11-sato-dev \ 26 task-poky-x11-sato-dev \
27 task-poky-devtools \ 27 task-poky-tools-debug \
28 task-poky-devtools-dbg \ 28 task-poky-tools-debug-dbg \
29 task-poky-devtools-dev \ 29 task-poky-tools-debug-dev \
30 task-poky-testapps \ 30 task-poky-tools-profile \
31 task-poky-testapps-dbg \ 31 task-poky-tools-profile-dbg \
32 task-poky-testapps-dev \ 32 task-poky-tools-profile-dev \
33 task-poky-tools-testapps \
34 task-poky-tools-testapps-dbg \
35 task-poky-tools-testapps-dev \
33 task-poky-nfs-server \ 36 task-poky-nfs-server \
34 task-poky-nfs-server-dbg \ 37 task-poky-nfs-server-dbg \
35 task-poky-nfs-server-dev \ 38 task-poky-nfs-server-dev \
@@ -41,12 +44,14 @@ XSERVER ?= "xserver-kdrive-fbdev"
41 44
42ALLOW_EMPTY = "1" 45ALLOW_EMPTY = "1"
43 46
47
44RDEPENDS_task-poky-apps-console = "\ 48RDEPENDS_task-poky-apps-console = "\
45 avahi-daemon \ 49 avahi-daemon \
46 dropbear \ 50 dropbear \
47 portmap \ 51 portmap \
48 psplash" 52 psplash"
49 53
54
50RDEPENDS_task-poky-x11-base = "\ 55RDEPENDS_task-poky-x11-base = "\
51 matchbox-common \ 56 matchbox-common \
52 matchbox-wm \ 57 matchbox-wm \
@@ -64,23 +69,25 @@ RDEPENDS_task-poky-x11-base = "\
64 xset \ 69 xset \
65 xrandr" 70 xrandr"
66 71
72
67RDEPENDS_task-poky-apps-x11-core = "\ 73RDEPENDS_task-poky-apps-x11-core = "\
68 leafpad \ 74 leafpad \
69 pcmanfm \ 75 pcmanfm \
70 rxvt-unicode \ 76 rxvt-unicode \
71 screenshot \ 77 screenshot"
72 " 78
73 79
74RDEPENDS_task-poky-apps-x11-games = "\ 80RDEPENDS_task-poky-apps-x11-games = "\
75 puzzles" 81 puzzles"
76 82
83
77RDEPENDS_task-poky-apps-x11-pimlico = "\ 84RDEPENDS_task-poky-apps-x11-pimlico = "\
78 eds-dbus \ 85 eds-dbus \
79 contacts \ 86 contacts \
80 dates \ 87 dates \
81 tasks \ 88 tasks \
82 web \ 89 web"
83 " 90
84 91
85RDEPENDS_task-poky-x11-sato = "\ 92RDEPENDS_task-poky-x11-sato = "\
86 matchbox-desktop \ 93 matchbox-desktop \
@@ -95,18 +102,27 @@ RDEPENDS_task-poky-x11-sato = "\
95 settings-daemon \ 102 settings-daemon \
96 gtk-sato-engine" 103 gtk-sato-engine"
97 104
98RDEPENDS_task-poky-devtools = "\ 105
106RDEPENDS_task-poky-tools-debug = "\
107 gdb \
108 strace"
109
110
111RDEPENDS_task-poky-tools-profile = "\
112 exmap-console \
113 exmap-server \
99 oprofile \ 114 oprofile \
100 oprofileui-server \ 115 oprofileui-server \
101 gdb \ 116 lttng-control \
102 strace \
103 less \
104 lttng-viewer" 117 lttng-viewer"
105 118
106RRECOMMENDS_task-poky-devtools = "\ 119RDEPENDS_task-poky-tools-profile_qemux86 += "valgrind"
120
121RRECOMMENDS_task-poky-tools-profile = "\
107 kernel-module-oprofile" 122 kernel-module-oprofile"
108 123
109RDEPENDS_task-poky-testapps = "\ 124
125RDEPENDS_task-poky-tools-testapps = "\
110 tslib-calibrate \ 126 tslib-calibrate \
111 tslib-tests \ 127 tslib-tests \
112 lrzsz \ 128 lrzsz \
@@ -114,7 +130,9 @@ RDEPENDS_task-poky-testapps = "\
114 alsa-utils-aplay \ 130 alsa-utils-aplay \
115 owl-video-widget \ 131 owl-video-widget \
116 gst-meta-video \ 132 gst-meta-video \
117 gst-meta-audio" 133 gst-meta-audio \
134 xvideo-tests"
135
118 136
119RDEPENDS_task-poky-nfs-server = "\ 137RDEPENDS_task-poky-nfs-server = "\
120 nfs-utils" 138 nfs-utils"