summaryrefslogtreecommitdiff
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 872f3c802..53aa12bf9 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -4,24 +4,52 @@
# IMAGE_FEATURES control content of images built with Poky.
#
-# By default we install task-poky-boot and task-poky-boot-extras packages - this
-# gives us working (console only) rootfs.
+# By default we install task-poky-boot and task-base packages - this gives us
+# working (console only) rootfs.
#
-# "apps-core", "apps-pda" and other tasks are defined in task-poky recipe and have
-# to add needed packages for selected task.
+# Available IMAGE_FEATURES:
+#
+# - apps-console-core
+# - x11-base - X11 server + minimal desktop
+# - x11-sato - OpenedHand Sato environment
+# - apps-x11-core - X Terminal, file manager, file editor
+# - apps-x11-games
+# - apps-x11-pimlico - OpenedHand Pimlico apps
+# - dev-tools - SDK
+# - dbg-tools
+# - test-tools - tools usable to make some device tests
+# - nfs-server - NFS server (exports / over NFS to everybody)
+# - dev-pkgs - development packages
+# - dbg-pkgs - debug packages
#
DISTRO_TASKS += '\
- ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-poky-boot-extras-dbg", "",d)} \
- ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-poky-boot-extras-dev", "",d)} \
- \
- ${@base_contains("IMAGE_FEATURES", "apps-core", "task-poky-base", "",d)} \
- ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-poky-base-dbg", "",d)} \
- ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-poky-base-dev", "",d)} \
- \
- ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-poky-standard", "",d)} \
- ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-poky-standard-dbg", "",d)} \
- ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-poky-standard-dev", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-base-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-poky-apps-console", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-poky-apps-console-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-poky-apps-console-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "x11-base", "task-poky-x11-base", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-poky-x11-base-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-poky-x11-base-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-poky-x11-sato", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-poky-x11-sato-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-poky-x11-sato-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-poky-apps-x11-core", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-poky-apps-x11-core-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-poky-apps-x11-core-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-poky-apps-x11-games", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-poky-apps-x11-games-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-poky-apps-x11-games-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-poky-apps-x11-pimlico", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-poky-apps-x11-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-poky-apps-x11-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "dev-tools", "task-poky-sdk", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \
@@ -36,8 +64,13 @@ DISTRO_TASKS += '\
${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
+ ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
'
IMAGE_INSTALL ?= "${DISTRO_TASKS}"
+X11_IMAGE_FEATURES = "x11-base apps-x11-core"
+SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico"
+
inherit image
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 0b3153a97..0e5610d58 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -201,7 +201,7 @@ IMAGE_FEATURES ?= ""
DISTRO_TASKS = "\
task-poky-boot \
- task-poky-boot-extras \
+ task-base \
"
#
diff --git a/meta/packages/images/poky-image-base.bb b/meta/packages/images/poky-image-base.bb
index 6122ce78d..d214642c4 100644
--- a/meta/packages/images/poky-image-base.bb
+++ b/meta/packages/images/poky-image-base.bb
@@ -2,4 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
+IMAGE_FEATURES += "apps-console-core"
+
inherit poky-image
diff --git a/meta/packages/images/poky-image-core.bb b/meta/packages/images/poky-image-core.bb
index 917a29a2f..edc50fa74 100644
--- a/meta/packages/images/poky-image-core.bb
+++ b/meta/packages/images/poky-image-core.bb
@@ -2,6 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-IMAGE_FEATURES += "apps-core"
+IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
inherit poky-image
diff --git a/meta/packages/images/poky-image-sato.bb b/meta/packages/images/poky-image-sato.bb
index 98b6754ad..58eb5d68c 100644
--- a/meta/packages/images/poky-image-sato.bb
+++ b/meta/packages/images/poky-image-sato.bb
@@ -2,6 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-IMAGE_FEATURES += "apps-core apps-pda"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
inherit poky-image
diff --git a/meta/packages/images/poky-image-sdk.bb b/meta/packages/images/poky-image-sdk.bb
index 7608f1fec..e6454db65 100644
--- a/meta/packages/images/poky-image-sdk.bb
+++ b/meta/packages/images/poky-image-sdk.bb
@@ -2,6 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
-IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
+IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-tools dev-pkgs dbg-pkgs"
inherit poky-image
diff --git a/meta/packages/tasks/task-poky.bb b/meta/packages/tasks/task-poky.bb
index 89f32a351..f965e2ff7 100644
--- a/meta/packages/tasks/task-poky.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -3,18 +3,27 @@
#
DESCRIPTION = "Tasks for OpenedHand Poky"
-PR = "r3"
+PR = "r4"
PACKAGES = "\
- task-poky-base \
- task-poky-base-dbg \
- task-poky-base-dev \
- task-poky-standard \
- task-poky-standard-dbg \
- task-poky-standard-dev \
- task-poky-boot-extras \
- task-poky-boot-extras-dbg \
- task-poky-boot-extras-dev \
+ task-poky-apps-console \
+ task-poky-apps-console-dbg \
+ task-poky-apps-console-dev \
+ task-poky-apps-x11-core \
+ task-poky-apps-x11-core-dbg \
+ task-poky-apps-x11-core-dev \
+ task-poky-apps-x11-games \
+ task-poky-apps-x11-games-dbg \
+ task-poky-apps-x11-games-dev \
+ task-poky-apps-x11-pimlico \
+ task-poky-apps-x11-pimlico-dbg \
+ task-poky-apps-x11-pimlico-dev \
+ task-poky-x11-base \
+ task-poky-x11-base-dbg \
+ task-poky-x11-base-dev \
+ task-poky-x11-sato \
+ task-poky-x11-sato-dbg \
+ task-poky-x11-sato-dev \
task-poky-devtools \
task-poky-devtools-dbg \
task-poky-devtools-dev \
@@ -32,11 +41,13 @@ XSERVER ?= "xserver-kdrive-fbdev"
ALLOW_EMPTY = "1"
-RDEPENDS_task-poky-boot-extras = "\
- task-base"
+RDEPENDS_task-poky-apps-console = "\
+ avahi-daemon \
+ dropbear \
+ portmap \
+ psplash"
-RDEPENDS_task-poky-base = "\
- psplash \
+RDEPENDS_task-poky-x11-base = "\
matchbox-common \
matchbox-wm \
matchbox-keyboard \
@@ -51,46 +62,38 @@ RDEPENDS_task-poky-base = "\
xauth \
xhost \
xset \
- xrandr \
- udev \
- sysfsutils \
- gdk-pixbuf-loader-png \
- gdk-pixbuf-loader-gif \
- gdk-pixbuf-loader-xpm \
- gdk-pixbuf-loader-jpeg \
- pango-module-basic-x \
- pango-module-basic-fc \
- gtk+ "
-
-RDEPENDS_task-poky-standard = "\
+ xrandr"
+
+RDEPENDS_task-poky-apps-x11-core = "\
leafpad \
- dropbear \
- portmap \
+ pcmanfm \
+ rxvt-unicode \
+ screenshot \
+ "
+
+RDEPENDS_task-poky-apps-x11-games = "\
+ puzzles"
+
+RDEPENDS_task-poky-apps-x11-pimlico = "\
+ eds-dbus \
+ contacts \
+ dates \
+ tasks \
+ web \
+ "
+
+RDEPENDS_task-poky-x11-sato = "\
matchbox-desktop \
matchbox-sato \
matchbox-keyboard \
matchbox-stroke \
matchbox-config-gtk \
- matchbox-themes-gtk \
+ matchbox-themes-gtk \
matchbox-applet-startup-monitor \
xcursor-transparent-theme \
sato-icon-theme \
settings-daemon \
- gtk-sato-engine \
- eds-dbus \
- contacts \
- dates \
- tasks \
- web \
- pcmanfm \
- puzzles \
- rxvt-unicode \
- screenshot \
- avahi-daemon \
- gnome-vfs \
- gnome-vfs-plugin-file \
- gnome-vfs-plugin-http"
-# matchbox-applet-inputmanager
+ gtk-sato-engine"
RDEPENDS_task-poky-devtools = "\
oprofile \
@@ -99,6 +102,7 @@ RDEPENDS_task-poky-devtools = "\
strace \
less \
lttng-viewer"
+
RRECOMMENDS_task-poky-devtools = "\
kernel-module-oprofile"
@@ -118,9 +122,3 @@ RDEPENDS_task-poky-nfs-server = "\
# rpcinfo can be useful
RRECOMMENDS_task-poky-nfs-server = "\
glibc-utils"
-
-# minimo \
-# teleport \
-# xst \
-# libgtkstylus \
-# xrdb \
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-24 14:07:05 +0000