summaryrefslogtreecommitdiffstats
path: root/meta/packages/images
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-12-20 00:00:03 +0000
committerRichard Purdie <richard@openedhand.com>2006-12-20 00:00:03 +0000
commitf5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20 (patch)
tree337089b8ad5015b9485099a263763c0c72cd3a99 /meta/packages/images
parent50bbb7742c760360d1003e441e2a029bee3035df (diff)
downloadpoky-f5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20.tar.gz
poky-f5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20.tar.bz2
poky-f5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20.zip
Remove DISTRO_TYPE, replacing with IMAGE_FEATURES. Documentation is in local.conf.sample
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1053 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/images')
-rw-r--r--meta/packages/images/oh-image-base.bb2
-rw-r--r--meta/packages/images/oh-image-core.bb7
-rw-r--r--meta/packages/images/oh-image-pda.bb10
-rw-r--r--meta/packages/images/oh-image-sdk.bb13
4 files changed, 10 insertions, 22 deletions
diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
index 4a61e70519..9b87f833e8 100644
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -4,7 +4,7 @@ export IMAGE_BASENAME = "oh-image-base"
DEPENDS = "task-oh"
-RDEPENDS = "task-oh-boot task-oh-boot-extras"
+RDEPENDS = "${DISTRO_TASKS}"
export PACKAGE_INSTALL = "${RDEPENDS}"
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index e416d84843..0e2e7d6f0d 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -2,12 +2,11 @@ PR = "r0"
export IMAGE_BASENAME = "oh-image-core"
+IMAGE_FEATURES += "apps-core"
+
DEPENDS = "task-oh"
-RDEPENDS = "\
- task-oh-boot \
- task-oh-boot-extras \
- task-oh-base "
+RDEPENDS = "${DISTRO_TASKS}"
export PACKAGE_INSTALL = "${RDEPENDS}"
diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb
index d4576a0c55..b072458a36 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -2,15 +2,11 @@ PR = "r10"
export IMAGE_BASENAME = "oh-image-pda"
+IMAGE_FEATURES += "apps-core apps-pda"
+
DEPENDS = "task-oh"
-RDEPENDS = "\
- task-oh-boot \
- task-oh-boot-extras \
- task-oh-base \
- task-oh-standard \
- ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \
- ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} "
+RDEPENDS = "${DISTRO_TASKS}"
export PACKAGE_INSTALL = "${RDEPENDS}"
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index d94ce2b1d4..581defb816 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -2,20 +2,13 @@ PR = "r9"
export IMAGE_BASENAME = "oh-image-sdk"
+IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
+
DEPENDS = "\
task-oh \
task-oh-sdk"
-RDEPENDS = "\
- task-oh-boot \
- task-oh-boot-extras \
- task-oh-base \
- task-oh-standard \
- task-oh-devtools \
- task-oh-testapps \
- task-oh-sdk \
- task-oh-sdk-base"
-
+RDEPENDS = "${DISTRO_TASKS}"
export PACKAGE_INSTALL = "${RDEPENDS}"
inherit image