summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-09-16 11:12:54 +0000
committerRichard Purdie <richard@openedhand.com>2006-09-16 11:12:54 +0000
commit3ea4918a0a8d6091845bdd3258a213dccfea8c62 (patch)
tree4c08ede79747daf4b6b27de4d68455ba5d18355c
parentc9eb0b3804715064b320f8e168ed556567449fad (diff)
downloadpoky-3ea4918a0a8d6091845bdd3258a213dccfea8c62.tar.gz
images: Remove XSERVER references now handled by task-oh
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@717 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/images/oh-image-core.bb5
-rw-r--r--meta/packages/images/oh-image-pda.bb5
-rw-r--r--meta/packages/images/oh-image-sdk.bb5
3 files changed, 3 insertions, 12 deletions
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index 4df974bde0..73f7afbe16 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -2,15 +2,12 @@ PR = "r0"
2 2
3export IMAGE_BASENAME = "oh-image-core" 3export IMAGE_BASENAME = "oh-image-core"
4 4
5XSERVER ?= "xserver-kdrive-fbdev"
6
7DEPENDS = "task-oh" 5DEPENDS = "task-oh"
8 6
9RDEPENDS = "\ 7RDEPENDS = "\
10 task-oh-boot \ 8 task-oh-boot \
11 task-oh-boot-extras \ 9 task-oh-boot-extras \
12 task-oh-base \ 10 task-oh-base "
13 ${XSERVER} "
14 11
15export IPKG_INSTALL = "${RDEPENDS}" 12export IPKG_INSTALL = "${RDEPENDS}"
16 13
diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb
index dba99d85a2..de2f3e0a4c 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -2,8 +2,6 @@ PR = "r10"
2 2
3export IMAGE_BASENAME = "oh-image-pda" 3export IMAGE_BASENAME = "oh-image-pda"
4 4
5XSERVER ?= "xserver-kdrive-fbdev"
6
7DEPENDS = "task-oh" 5DEPENDS = "task-oh"
8 6
9RDEPENDS = "\ 7RDEPENDS = "\
@@ -12,8 +10,7 @@ RDEPENDS = "\
12 task-oh-base \ 10 task-oh-base \
13 task-oh-standard \ 11 task-oh-standard \
14 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \ 12 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \
15 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} \ 13 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} "
16 ${XSERVER} "
17 14
18export IPKG_INSTALL = "${RDEPENDS}" 15export IPKG_INSTALL = "${RDEPENDS}"
19 16
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index 58f764844a..71b1c300b5 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -2,8 +2,6 @@ PR = "r9"
2 2
3export IMAGE_BASENAME = "oh-image-sdk" 3export IMAGE_BASENAME = "oh-image-sdk"
4 4
5XSERVER ?= "xserver-kdrive-fbdev"
6
7DEPENDS = "\ 5DEPENDS = "\
8 task-oh \ 6 task-oh \
9 task-oh-sdk" 7 task-oh-sdk"
@@ -15,8 +13,7 @@ RDEPENDS = "\
15 task-oh-standard \ 13 task-oh-standard \
16 task-oh-devtools \ 14 task-oh-devtools \
17 task-oh-testapps \ 15 task-oh-testapps \
18 task-oh-sdk \ 16 task-oh-sdk "
19 ${XSERVER} "
20 17
21export IPKG_INSTALL = "${RDEPENDS}" 18export IPKG_INSTALL = "${RDEPENDS}"
22 19