[oe-commits] org.oe.dev merge of '6047723508e3b6eeb7bb92d452b11b5e946540bf'

[xora commit]

merge of '6047723508e3b6eeb7bb92d452b11b5e946540bf'
     and 'd30c6b8bd3c20b5346a9fd726b241df1917bf08e'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 95b65603cddbae832076e12aaeb4aac4481b2073
ViewMTN: http://monotone.openembedded.org/revision/info/95b65603cddbae832076e12aaeb4aac4481b2073
Files:
1
packages/smartmontools/smartmontools_5.38.bb
packages/images/opie-image-16mb.bb
packages/images/opie-image.bb
Diffs:

#
# mt diff -r6047723508e3b6eeb7bb92d452b11b5e946540bf -r95b65603cddbae832076e12aaeb4aac4481b2073
#
#
#
# add_file "packages/smartmontools/smartmontools_5.38.bb"
#  content [90c136f161e80e9c22e057a4e7a40eafeedd513b]
#
============================================================
--- packages/smartmontools/smartmontools_5.38.bb	90c136f161e80e9c22e057a4e7a40eafeedd513b
+++ packages/smartmontools/smartmontools_5.38.bb	90c136f161e80e9c22e057a4e7a40eafeedd513b
@@ -0,0 +1 @@
+include smartmontools.inc


#
# mt diff -rd30c6b8bd3c20b5346a9fd726b241df1917bf08e -r95b65603cddbae832076e12aaeb4aac4481b2073
#
#
#
# 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 \