[oe-commits] org.oe.angstrom-2007.12-stable opie-images: use other base tasks

[koen commit]

opie-images: use other base tasks 

applied changes from 6833078eec71bea42cec794b6ba6ad8981faf70e
             through 6047723508e3b6eeb7bb92d452b11b5e946540bf

Author: koen at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 3e5a2d09ebcb070bb90c0f4015aa28e1615619ff
ViewMTN: http://monotone.openembedded.org/revision/info/3e5a2d09ebcb070bb90c0f4015aa28e1615619ff
Files:
1
BACKPORTS.txt
packages/images/opie-image-16mb.bb
packages/images/opie-image.bb
Diffs:

#
# mt diff -r5ba37c95036e4d164df8f3f93e651a295b66439e -r3e5a2d09ebcb070bb90c0f4015aa28e1615619ff
#
#
#
# patch "BACKPORTS.txt"
#  from [7d4aea311ccf6ffd01f24cc280f8238b4bf41272]
#    to [4e050ad93fe83beddf27036d0d2dbc1e3c7d8269]
# 
# patch "packages/images/opie-image-16mb.bb"
#  from [1228a8f171a2b91c0604a288575a91fcdf3d258c]
#    to [ed0f6ec0f38f046617e1c0af7ed306296c4bb02b]
# 
# patch "packages/images/opie-image.bb"
#  from [a1c62875ee2fbe52f0ba014c4931559c768b671c]
#    to [aedacdeb41ac211eb9913ed1489c3c998bbb6b17]
#
============================================================
--- BACKPORTS.txt	7d4aea311ccf6ffd01f24cc280f8238b4bf41272
+++ BACKPORTS.txt	4e050ad93fe83beddf27036d0d2dbc1e3c7d8269
@@ -202,4 +202,5 @@
 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)
 
============================================================
--- 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 \