From 40c209b79d5547297a6882d2426e96e5b0fc46eb Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 28 Jun 2007 10:51:31 +0000 Subject: 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 --- meta/classes/poky-image.bbclass | 61 +++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 14 deletions(-) (limited to 'meta/classes/poky-image.bbclass') 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 -- cgit v1.2.3