sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Cleaned up task-poky and Poky images. 

By default we install task-poky-boot and task-base. Additional stuff was split
to several tasks and each got IMAGE_FEATURE.


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2037 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz 2007-06-28 10:51:31 +00:00
parent d4ed273e04
commit 40c209b79d
7 changed files with 104 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
meta/classes/poky-image.bbclass
View File

@ -4,24 +4,52 @@
# IMAGE_FEATURES control content of images built with Poky. # IMAGE_FEATURES control content of images built with Poky.
# #
# By default we install task-poky-boot and task-poky-boot-extras packages - this # By default we install task-poky-boot and task-base packages - this gives us
# gives us working (console only) rootfs. # working (console only) rootfs.
# #
# "apps-core", "apps-pda" and other tasks are defined in task-poky recipe and have # Available IMAGE_FEATURES:
# to add needed packages for selected task. #
# - 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 += '\ DISTRO_TASKS += '\
${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-poky-boot-extras-dbg", "",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-poky-boot-extras-dev", "",d)} \ ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-base-dev", "",d)} \
\ \
${@base_contains("IMAGE_FEATURES", "apps-core", "task-poky-base", "",d)} \ ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-poky-apps-console", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-poky-base-dbg", "",d)} \ ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-poky-apps-console-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-poky-base-dev", "",d)} \ ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-poky-apps-console-dev", "",d)} \
\ \
${@base_contains("IMAGE_FEATURES", "apps-pda", "task-poky-standard", "",d)} \ ${@base_contains("IMAGE_FEATURES", "x11-base", "task-poky-x11-base", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-poky-standard-dbg", "",d)} \ ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-poky-x11-base-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-poky-standard-dev", "",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", "task-poky-sdk", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",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", ["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", "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}" 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 inherit image

2
meta/conf/distro/poky.conf
View File

@ -201,7 +201,7 @@ IMAGE_FEATURES ?= ""
DISTRO_TASKS = "\ DISTRO_TASKS = "\
task-poky-boot \ task-poky-boot \
task-poky-boot-extras \ task-base \
" "
# #

2
meta/packages/images/poky-image-base.bb
View File

@ -2,4 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd. # Copyright (C) 2007 OpenedHand Ltd.
# #
IMAGE_FEATURES += "apps-console-core"
inherit poky-image inherit poky-image

2
meta/packages/images/poky-image-core.bb
View File

@ -2,6 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd. # Copyright (C) 2007 OpenedHand Ltd.
# #
IMAGE_FEATURES += "apps-core" IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
inherit poky-image inherit poky-image

2
meta/packages/images/poky-image-sato.bb
View File

@ -2,6 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd. # Copyright (C) 2007 OpenedHand Ltd.
# #
IMAGE_FEATURES += "apps-core apps-pda" IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
inherit poky-image inherit poky-image

2
meta/packages/images/poky-image-sdk.bb
View File

@ -2,6 +2,6 @@
# Copyright (C) 2007 OpenedHand Ltd. # 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 inherit poky-image

94
meta/packages/tasks/task-poky.bb
View File

@ -3,18 +3,27 @@
# #
DESCRIPTION = "Tasks for OpenedHand Poky" DESCRIPTION = "Tasks for OpenedHand Poky"
PR = "r3" PR = "r4"
PACKAGES = "\ PACKAGES = "\
task-poky-base \ task-poky-apps-console \
task-poky-base-dbg \ task-poky-apps-console-dbg \
task-poky-base-dev \ task-poky-apps-console-dev \
task-poky-standard \ task-poky-apps-x11-core \
task-poky-standard-dbg \ task-poky-apps-x11-core-dbg \
task-poky-standard-dev \ task-poky-apps-x11-core-dev \
task-poky-boot-extras \ task-poky-apps-x11-games \
task-poky-boot-extras-dbg \ task-poky-apps-x11-games-dbg \
task-poky-boot-extras-dev \ 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 \
task-poky-devtools-dbg \ task-poky-devtools-dbg \
task-poky-devtools-dev \ task-poky-devtools-dev \
@ -32,11 +41,13 @@ XSERVER ?= "xserver-kdrive-fbdev"
ALLOW_EMPTY = "1" ALLOW_EMPTY = "1"
RDEPENDS_task-poky-boot-extras = "\ RDEPENDS_task-poky-apps-console = "\
task-base" avahi-daemon \
dropbear \
portmap \
psplash"
RDEPENDS_task-poky-base = "\ RDEPENDS_task-poky-x11-base = "\
psplash \
matchbox-common \ matchbox-common \
matchbox-wm \ matchbox-wm \
matchbox-keyboard \ matchbox-keyboard \
@ -51,21 +62,27 @@ RDEPENDS_task-poky-base = "\
xauth \ xauth \
xhost \ xhost \
xset \ xset \
xrandr \ 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 = "\ RDEPENDS_task-poky-apps-x11-core = "\
leafpad \ leafpad \
dropbear \ pcmanfm \
portmap \ 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-desktop \
matchbox-sato \ matchbox-sato \
matchbox-keyboard \ matchbox-keyboard \
@ -76,21 +93,7 @@ RDEPENDS_task-poky-standard = "\
xcursor-transparent-theme \ xcursor-transparent-theme \
sato-icon-theme \ sato-icon-theme \
settings-daemon \ settings-daemon \
gtk-sato-engine \ 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
RDEPENDS_task-poky-devtools = "\ RDEPENDS_task-poky-devtools = "\
oprofile \ oprofile \
@ -99,6 +102,7 @@ RDEPENDS_task-poky-devtools = "\
strace \ strace \
less \ less \
lttng-viewer" lttng-viewer"
RRECOMMENDS_task-poky-devtools = "\ RRECOMMENDS_task-poky-devtools = "\
kernel-module-oprofile" kernel-module-oprofile"
@ -118,9 +122,3 @@ RDEPENDS_task-poky-nfs-server = "\
# rpcinfo can be useful # rpcinfo can be useful
RRECOMMENDS_task-poky-nfs-server = "\ RRECOMMENDS_task-poky-nfs-server = "\
glibc-utils" glibc-utils"
# minimo \
# teleport \
# xst \
# libgtkstylus \
# xrdb \