summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/classes/poky-image.bbclass61
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/images/poky-image-base.bb2
-rw-r--r--meta/packages/images/poky-image-core.bb2
-rw-r--r--meta/packages/images/poky-image-sato.bb2
-rw-r--r--meta/packages/images/poky-image-sdk.bb2
-rw-r--r--meta/packages/tasks/task-poky.bb98
7 files changed, 101 insertions, 68 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 872f3c8028..53aa12bf95 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -4,24 +4,52 @@
4 4
5# IMAGE_FEATURES control content of images built with Poky. 5# IMAGE_FEATURES control content of images built with Poky.
6# 6#
7# By default we install task-poky-boot and task-poky-boot-extras packages - this 7# By default we install task-poky-boot and task-base packages - this gives us
8# gives us working (console only) rootfs. 8# working (console only) rootfs.
9# 9#
10# "apps-core", "apps-pda" and other tasks are defined in task-poky recipe and have 10# Available IMAGE_FEATURES:
11# to add needed packages for selected task. 11#
12# - apps-console-core
13# - x11-base - X11 server + minimal desktop
14# - x11-sato - OpenedHand Sato environment
15# - apps-x11-core - X Terminal, file manager, file editor
16# - apps-x11-games
17# - apps-x11-pimlico - OpenedHand Pimlico apps
18# - dev-tools - SDK
19# - dbg-tools
20# - test-tools - tools usable to make some device tests
21# - nfs-server - NFS server (exports / over NFS to everybody)
22# - dev-pkgs - development packages
23# - dbg-pkgs - debug packages
12# 24#
13 25
14DISTRO_TASKS += '\ 26DISTRO_TASKS += '\
15 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-poky-boot-extras-dbg", "",d)} \ 27 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \
16 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-poky-boot-extras-dev", "",d)} \ 28 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \
17 \ 29 \
18 ${@base_contains("IMAGE_FEATURES", "apps-core", "task-poky-base", "",d)} \ 30 ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-poky-apps-console", "",d)} \
19 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-poky-base-dbg", "",d)} \ 31 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-poky-apps-console-dbg", "",d)} \
20 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-poky-base-dev", "",d)} \ 32 ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-poky-apps-console-dev", "",d)} \
21 \ 33 \
22 ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-poky-standard", "",d)} \ 34 ${@base_contains("IMAGE_FEATURES", "x11-base", "task-poky-x11-base", "",d)} \
23 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-poky-standard-dbg", "",d)} \ 35 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-poky-x11-base-dbg", "",d)} \
24 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-poky-standard-dev", "",d)} \ 36 ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-poky-x11-base-dev", "",d)} \
37 \
38 ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-poky-x11-sato", "",d)} \
39 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \
40 ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \
41 \
42 ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \
43 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \
44 ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \
45 \
46 ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-poky-apps-x11-games", "",d)} \
47 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-poky-apps-x11-games-dbg", "",d)} \
48 ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-poky-apps-x11-games-dev", "",d)} \
49 \
50 ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-poky-apps-x11-pimlico", "",d)} \
51 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-poky-apps-x11-dbg", "",d)} \
52 ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-poky-apps-x11-dev", "",d)} \
25 \ 53 \
26 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-poky-sdk", "",d)} \ 54 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-poky-sdk", "",d)} \
27 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \ 55 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \
@@ -36,8 +64,13 @@ DISTRO_TASKS += '\
36 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \ 64 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \
37 \ 65 \
38 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \ 66 ${@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)} \
68 ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
39 ' 69 '
40 70
41IMAGE_INSTALL ?= "${DISTRO_TASKS}" 71IMAGE_INSTALL ?= "${DISTRO_TASKS}"
42 72
73X11_IMAGE_FEATURES = "x11-base apps-x11-core"
74SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico"
75
43inherit image 76inherit image
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 0b3153a975..0e5610d58a 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -201,7 +201,7 @@ IMAGE_FEATURES ?= ""
201 201
202DISTRO_TASKS = "\ 202DISTRO_TASKS = "\
203 task-poky-boot \ 203 task-poky-boot \
204 task-poky-boot-extras \ 204 task-base \
205 " 205 "
206 206
207# 207#
diff --git a/meta/packages/images/poky-image-base.bb b/meta/packages/images/poky-image-base.bb
index 6122ce78d9..d214642c40 100644
--- a/meta/packages/images/poky-image-base.bb
+++ b/meta/packages/images/poky-image-base.bb
@@ -2,4 +2,6 @@
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4 4
5IMAGE_FEATURES += "apps-console-core"
6
5inherit poky-image 7inherit poky-image
diff --git a/meta/packages/images/poky-image-core.bb b/meta/packages/images/poky-image-core.bb
index 917a29a2ff..edc50fa74b 100644
--- a/meta/packages/images/poky-image-core.bb
+++ b/meta/packages/images/poky-image-core.bb
@@ -2,6 +2,6 @@
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4 4
5IMAGE_FEATURES += "apps-core" 5IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
6 6
7inherit poky-image 7inherit poky-image
diff --git a/meta/packages/images/poky-image-sato.bb b/meta/packages/images/poky-image-sato.bb
index 98b6754ad3..58eb5d68c2 100644
--- a/meta/packages/images/poky-image-sato.bb
+++ b/meta/packages/images/poky-image-sato.bb
@@ -2,6 +2,6 @@
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4 4
5IMAGE_FEATURES += "apps-core apps-pda" 5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
6 6
7inherit poky-image 7inherit poky-image
diff --git a/meta/packages/images/poky-image-sdk.bb b/meta/packages/images/poky-image-sdk.bb
index 7608f1fec9..e6454db658 100644
--- a/meta/packages/images/poky-image-sdk.bb
+++ b/meta/packages/images/poky-image-sdk.bb
@@ -2,6 +2,6 @@
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2007 OpenedHand Ltd.
3# 3#
4 4
5IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs" 5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-tools dev-pkgs dbg-pkgs"
6 6
7inherit poky-image 7inherit poky-image
diff --git a/meta/packages/tasks/task-poky.bb b/meta/packages/tasks/task-poky.bb
index 89f32a3518..f965e2ff74 100644
--- a/meta/packages/tasks/task-poky.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -3,18 +3,27 @@
3# 3#
4 4
5DESCRIPTION = "Tasks for OpenedHand Poky" 5DESCRIPTION = "Tasks for OpenedHand Poky"
6PR = "r3" 6PR = "r4"
7 7
8PACKAGES = "\ 8PACKAGES = "\
9 task-poky-base \ 9 task-poky-apps-console \
10 task-poky-base-dbg \ 10 task-poky-apps-console-dbg \
11 task-poky-base-dev \ 11 task-poky-apps-console-dev \
12 task-poky-standard \ 12 task-poky-apps-x11-core \
13 task-poky-standard-dbg \ 13 task-poky-apps-x11-core-dbg \
14 task-poky-standard-dev \ 14 task-poky-apps-x11-core-dev \
15 task-poky-boot-extras \ 15 task-poky-apps-x11-games \
16 task-poky-boot-extras-dbg \ 16 task-poky-apps-x11-games-dbg \
17 task-poky-boot-extras-dev \ 17 task-poky-apps-x11-games-dev \
18 task-poky-apps-x11-pimlico \
19 task-poky-apps-x11-pimlico-dbg \
20 task-poky-apps-x11-pimlico-dev \
21 task-poky-x11-base \
22 task-poky-x11-base-dbg \
23 task-poky-x11-base-dev \
24 task-poky-x11-sato \
25 task-poky-x11-sato-dbg \
26 task-poky-x11-sato-dev \
18 task-poky-devtools \ 27 task-poky-devtools \
19 task-poky-devtools-dbg \ 28 task-poky-devtools-dbg \
20 task-poky-devtools-dev \ 29 task-poky-devtools-dev \
@@ -32,11 +41,13 @@ XSERVER ?= "xserver-kdrive-fbdev"
32 41
33ALLOW_EMPTY = "1" 42ALLOW_EMPTY = "1"
34 43
35RDEPENDS_task-poky-boot-extras = "\ 44RDEPENDS_task-poky-apps-console = "\
36 task-base" 45 avahi-daemon \
46 dropbear \
47 portmap \
48 psplash"
37 49
38RDEPENDS_task-poky-base = "\ 50RDEPENDS_task-poky-x11-base = "\
39 psplash \
40 matchbox-common \ 51 matchbox-common \
41 matchbox-wm \ 52 matchbox-wm \
42 matchbox-keyboard \ 53 matchbox-keyboard \
@@ -51,46 +62,38 @@ RDEPENDS_task-poky-base = "\
51 xauth \ 62 xauth \
52 xhost \ 63 xhost \
53 xset \ 64 xset \
54 xrandr \ 65 xrandr"
55 udev \ 66
56 sysfsutils \ 67RDEPENDS_task-poky-apps-x11-core = "\
57 gdk-pixbuf-loader-png \
58 gdk-pixbuf-loader-gif \
59 gdk-pixbuf-loader-xpm \
60 gdk-pixbuf-loader-jpeg \
61 pango-module-basic-x \
62 pango-module-basic-fc \
63 gtk+ "
64
65RDEPENDS_task-poky-standard = "\
66 leafpad \ 68 leafpad \
67 dropbear \ 69 pcmanfm \
68 portmap \ 70 rxvt-unicode \
71 screenshot \
72 "
73
74RDEPENDS_task-poky-apps-x11-games = "\
75 puzzles"
76
77RDEPENDS_task-poky-apps-x11-pimlico = "\
78 eds-dbus \
79 contacts \
80 dates \
81 tasks \
82 web \
83 "
84
85RDEPENDS_task-poky-x11-sato = "\
69 matchbox-desktop \ 86 matchbox-desktop \
70 matchbox-sato \ 87 matchbox-sato \
71 matchbox-keyboard \ 88 matchbox-keyboard \
72 matchbox-stroke \ 89 matchbox-stroke \
73 matchbox-config-gtk \ 90 matchbox-config-gtk \
74 matchbox-themes-gtk \ 91 matchbox-themes-gtk \
75 matchbox-applet-startup-monitor \ 92 matchbox-applet-startup-monitor \
76 xcursor-transparent-theme \ 93 xcursor-transparent-theme \
77 sato-icon-theme \ 94 sato-icon-theme \
78 settings-daemon \ 95 settings-daemon \
79 gtk-sato-engine \ 96 gtk-sato-engine"
80 eds-dbus \
81 contacts \
82 dates \
83 tasks \
84 web \
85 pcmanfm \
86 puzzles \
87 rxvt-unicode \
88 screenshot \
89 avahi-daemon \
90 gnome-vfs \
91 gnome-vfs-plugin-file \
92 gnome-vfs-plugin-http"
93# matchbox-applet-inputmanager
94 97
95RDEPENDS_task-poky-devtools = "\ 98RDEPENDS_task-poky-devtools = "\
96 oprofile \ 99 oprofile \
@@ -99,6 +102,7 @@ RDEPENDS_task-poky-devtools = "\
99 strace \ 102 strace \
100 less \ 103 less \
101 lttng-viewer" 104 lttng-viewer"
105
102RRECOMMENDS_task-poky-devtools = "\ 106RRECOMMENDS_task-poky-devtools = "\
103 kernel-module-oprofile" 107 kernel-module-oprofile"
104 108
@@ -118,9 +122,3 @@ RDEPENDS_task-poky-nfs-server = "\
118# rpcinfo can be useful 122# rpcinfo can be useful
119RRECOMMENDS_task-poky-nfs-server = "\ 123RRECOMMENDS_task-poky-nfs-server = "\
120 glibc-utils" 124 glibc-utils"
121
122# minimo \
123# teleport \
124# xst \
125# libgtkstylus \
126# xrdb \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 04:46:35 +0000