opie-image-(16mb): replace MACHINE_TASK_PROVIDER with task_boot/task_base courtesy...

* oebug# 3969
* add task-base-extended for devices without built in wifi
* remove borken merge feeds

diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb
index 42bf611880356a8d664e474dfc65c4ed46bcac9c..3abab2e72655e32f9c06679332d3b3049d625c91 100644 (file)
--- 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 04c1f260e8027e5aeaec277466748d1758b8d90a..54e38c498f7057c190f4d8a085541e393553d198 100644 (file)
--- 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 \