mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-09 02:03:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Poky images: move IMAGE_FEATURES stuff to separate file, simplify image recipes

Browse Source 
poky-image.inc contain DISTRO_TASKS stuff related to image content (was in poky.conf)


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1735 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2007-05-16 14:47:38 +00:00
parent 8142b95bf2
commit 4baa324e2e
7 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,27 +204,7 @@ IMAGE_FEATURES ?= ""
DISTRO_TASKS = "\
task-oh-boot \
${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev", "",d)} \
task-oh-boot-extras \
${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-extras-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-extras-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \
"
#

4
meta/packages/images/oh-image-base.bb
View File

@@ -2,6 +2,4 @@
# Copyright (C) 2007 OpenedHand Ltd.
#
IMAGE_INSTALL = "${DISTRO_TASKS}"
inherit image
require poky-image.inc

3
meta/packages/images/oh-image-core.bb
View File

@@ -3,6 +3,5 @@
#
IMAGE_FEATURES += "apps-core"
IMAGE_INSTALL = "${DISTRO_TASKS}"
inherit image
require poky-image.inc

3
meta/packages/images/oh-image-minimal.bb
View File

@@ -3,7 +3,8 @@
#
IMAGE_INSTALL = "task-oh-boot"
inherit image
require poky-image.inc
# remove not needed stuff (locale support and ipkg support)
ROOTFS_POSTPROCESS_COMMAND += "rm -rf ${IMAGE_ROOTFS}/usr/share/i18n/ ${IMAGE_ROOTFS}/usr/lib/ipkg/"

4
meta/packages/images/oh-image-pda.bb
View File

@@ -3,5 +3,5 @@
#
IMAGE_FEATURES += "apps-core apps-pda"
IMAGE_INSTALL = "${DISTRO_TASKS}"
inherit image
require poky-image.inc

4
meta/packages/images/oh-image-sdk.bb
View File

@@ -3,5 +3,5 @@
#
IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
IMAGE_INSTALL = "${DISTRO_TASKS}"
inherit image
require poky-image.inc

43
meta/packages/images/poky-image.inc Normal file
View File

@@ -0,0 +1,43 @@
# Common for Poky images
#
# Copyright (C) 2007 OpenedHand LTD
# IMAGE_FEATURES control content of images built with Poky.
#
# By default we install task-oh-boot and task-oh-boot-extras packages - this
# gives us working (console only) rootfs.
#
# "apps-core", "apps-pda" and other tasks are defined in task-oh recipe and have
# to add needed packages for selected task.
#
DISTRO_TASKS += '\
${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg task-oh-boot-extras-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev task-oh-boot-extras-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \
'
IMAGE_INSTALL ?= "${DISTRO_TASKS}"
inherit image