diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-05-30 13:46:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-30 13:46:03 +0000 |
| commit | 85d3283d2fd79069654933817d200e6dd6d6254b (patch) | |
| tree | eb113a631598355dd469cb3c257b66def53a10d4 /meta-extras/packages/images | |
| parent | ab5005a4720daa149b65e7caafcaea85d2ccb755 (diff) | |
| download | openembedded-core-85d3283d2fd79069654933817d200e6dd6d6254b.tar.gz openembedded-core-85d3283d2fd79069654933817d200e6dd6d6254b.tar.bz2 openembedded-core-85d3283d2fd79069654933817d200e6dd6d6254b.zip | |
meta-extras: Various cleanups
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1825 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/images')
| -rw-r--r-- | meta-extras/packages/images/oh-image-extras.bb | 31 | ||||
| -rw-r--r-- | meta-extras/packages/images/poky-image.inc | 43 |
2 files changed, 49 insertions, 25 deletions
diff --git a/meta-extras/packages/images/oh-image-extras.bb b/meta-extras/packages/images/oh-image-extras.bb index b62774205e..d9b879683b 100644 --- a/meta-extras/packages/images/oh-image-extras.bb +++ b/meta-extras/packages/images/oh-image-extras.bb @@ -1,28 +1,9 @@ -PR = "r9" +# +# Copyright (C) 2007 OpenedHand Ltd. +# -export IMAGE_BASENAME = "oh-extras" +IMAGE_FEATURES += "apps-core apps-pda" -GUI_MACHINE_CLASS ?= "none" +require poky-image.inc -XSERVER ?= "xserver-kdrive-fbdev" - -DEPENDS = "\ - task-oh \ - task-oh-extras" - -RDEPENDS = "\ - task-base \ - task-oh-boot \ - task-oh-boot-extras \ - task-oh-base \ - task-oh-standard \ - task-oh-testapps \ - task-oh-devtools \ - task-oh-extraapps \ - ${XSERVER} " - -export PACKAGE_INSTALL = "${RDEPENDS}" -#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " - -inherit image -LICENSE = MIT +IMAGE_INSTALL += "task-oh-extraapps" diff --git a/meta-extras/packages/images/poky-image.inc b/meta-extras/packages/images/poky-image.inc new file mode 100644 index 0000000000..6f1bed9760 --- /dev/null +++ b/meta-extras/packages/images/poky-image.inc @@ -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 |