summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJunqian Gordon Xu <xjqian@gmail.com>2008-03-12 18:43:36 +0000
committerJunqian Gordon Xu <xjqian@gmail.com>2008-03-12 18:43:36 +0000
commitcec1b020d3e88d90cd1aa209f69d28a0e322eb93 (patch)
treefd0cf5b606a4e2ecc5bfaea7ede2f255625c2e27 /packages
parent61835c2897efc6eb52f588ac9a351ec37e82d75a (diff)
opie-image-(16mb): replace MACHINE_TASK_PROVIDER with task_boot/task_base courtesy of Henry von Tresckow <hvontres@gmail.com>
* oebug# 3969 * add task-base-extended for devices without built in wifi * remove borken merge feeds
Diffstat (limited to 'packages')
-rw-r--r--packages/images/opie-image-16mb.bb4
-rw-r--r--packages/images/opie-image.bb4
2 files changed, 4 insertions, 4 deletions
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 \