aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-03-14 10:14:34 +0000
committerKoen Kooi <koen@openembedded.org>2008-03-14 10:14:34 +0000
commit7fc0c9f3f98536f1a65b99bced334818901c5ce1 (patch)
treeae941eec276a6b1e27db927f3157dd540bc8f07c
parentf9718ad80426e32a81712beaf7e90ee61bcd09a6 (diff)
downloadopenembedded-7fc0c9f3f98536f1a65b99bced334818901c5ce1.tar.gz
opie-images: use other base tasks
applied changes from 6833078eec71bea42cec794b6ba6ad8981faf70e through 6047723508e3b6eeb7bb92d452b11b5e946540bf
-rw-r--r--BACKPORTS.txt1
-rw-r--r--packages/images/opie-image-16mb.bb4
-rw-r--r--packages/images/opie-image.bb4
3 files changed, 5 insertions, 4 deletions
diff --git a/BACKPORTS.txt b/BACKPORTS.txt
index c4fe5137e8..fbed656aa5 100644
--- a/BACKPORTS.txt
+++ b/BACKPORTS.txt
@@ -202,4 +202,5 @@ c72441dc719a5903a8fdc705f309c086346249b0 alsa-state spitz + akita fixes (Stanisl
c4d9a3436b6b5626505d88d0ed299c5e20d25227 altboot collie fix (Koen, xjqian)
4d3fe649ba5cd8d8a2492eb428e3d03d91d873a2 altboot collie fix (Koen, xjqian)
43753505f023f7853afdd0f497c28ef65c4b2509 kernel: add wifi suspend fix for hostap|orinoco. Also, add base_version_less_or_equal(). (Bernhard, PaulS)
+6047723508e3b6eeb7bb92d452b11b5e946540bf opie-image fixes (Henry, Junqian)
diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb
index 42bf611880..3abab2e726 100644
--- a/packages/images/opie-image-16mb.bb
+++ b/packages/images/opie-image-16mb.bb
@@ -1,6 +1,6 @@
IMAGE_LINGUAS = ""
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb"
+DEPENDS = "task-boot task-opie-16mb"
IMAGE_INSTALL = "task-boot \
ipkg ipkg-collateral \
@@ -14,6 +14,6 @@ IMAGE_INSTALL = "task-boot \
task-opie-irda"
# create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
inherit image
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index 04c1f260e8..54e38c498f 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -1,8 +1,8 @@
IMAGE_LINGUAS = ""
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie"
+DEPENDS = "task-base task-opie"
-IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \
+IMAGE_INSTALL = "task-base-extended task-opie-base task-opie-base-applets \
task-opie-base-inputmethods task-opie-base-apps \
task-opie-base-settings task-opie-base-decorations \
task-opie-base-styles task-opie-base-pim \