[oe-commits] org.oe.dev opie-image-(16mb): replace MACHINE_TASK_PROVIDER with task_boot/task_base courtesy of Henry von Tresckow <hvontres at gmail.com>

[xjqian commit]

opie-image-(16mb): replace MACHINE_TASK_PROVIDER with task_boot/task_base   courtesy of Henry von Tresckow <hvontres at gmail.com>
* oebug# 3969
* add task-base-extended for devices without built in wifi
* remove borken merge feeds

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 6047723508e3b6eeb7bb92d452b11b5e946540bf
ViewMTN: http://monotone.openembedded.org/revision/info/6047723508e3b6eeb7bb92d452b11b5e946540bf
Files:
1
packages/images/opie-image-16mb.bb
packages/images/opie-image.bb
Diffs:

#
# mt diff -r6833078eec71bea42cec794b6ba6ad8981faf70e -r6047723508e3b6eeb7bb92d452b11b5e946540bf
#
#
#
# patch "packages/images/opie-image-16mb.bb"
#  from [1228a8f171a2b91c0604a288575a91fcdf3d258c]
#    to [ed0f6ec0f38f046617e1c0af7ed306296c4bb02b]
# 
# patch "packages/images/opie-image.bb"
#  from [a1c62875ee2fbe52f0ba014c4931559c768b671c]
#    to [aedacdeb41ac211eb9913ed1489c3c998bbb6b17]
#
============================================================
--- packages/images/opie-image-16mb.bb	1228a8f171a2b91c0604a288575a91fcdf3d258c
+++ packages/images/opie-image-16mb.bb	ed0f6ec0f38f046617e1c0af7ed306296c4bb02b
@@ -1,6 +1,6 @@ IMAGE_LINGUAS = ""
 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
============================================================
--- packages/images/opie-image.bb	a1c62875ee2fbe52f0ba014c4931559c768b671c
+++ packages/images/opie-image.bb	aedacdeb41ac211eb9913ed1489c3c998bbb6b17
@@ -1,8 +1,8 @@ IMAGE_LINGUAS = ""
 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 \