14 files changed, 23 insertions, 23 deletions
diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb
index 68cfac7490..04b1aa299d 100644
--- a/packages/images/bootstrap-image-bootchart.bb
+++ b/packages/images/bootstrap-image-bootchart.bb
@@ -1,8 +1,8 @@
 export IMAGE_BASENAME = "bootstrap-image-bootchart"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap bootchart acct"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct"
 
-DEPENDS = "task-bootstrap bootchart"
+DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart"
 RDEPENDS = "acct"
 
 inherit image_ipk
diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb
index 1791dd8f56..50c1a8f354 100644
--- a/packages/images/bootstrap-image.bb
+++ b/packages/images/bootstrap-image.bb
@@ -1,8 +1,8 @@
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER}"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 
 inherit image_ipk
 
diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb
index fa964b4490..b1c714c79e 100644
--- a/packages/images/dvb-image.bb
+++ b/packages/images/dvb-image.bb
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "dvb-image"
 
 IMAGE_LINGUAS = ""
 
-DVB_PACKAGES = "task-bootstrap task-dvb"
+DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb"
 
 export IPKG_INSTALL = "${DVB_PACKAGES}"
 DEPENDS = "${DVB_PACKAGES}"
diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb
index 9a1ed51a1a..f41f04ee23 100644
--- a/packages/images/e-image-core.bb
+++ b/packages/images/e-image-core.bb
@@ -5,7 +5,7 @@ PR = "r1"
 export IMAGE_BASENAME = "e-image-core"
 export IMAGE_LINGUAS = ""
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
            xserver-kdrive \
            task-e-x11-core"
 
@@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
 PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
 PREFERRED_PROVIDER_libx11 = "libx11"
 
-export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
 
 inherit image_ipk
diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb
index 92bed0dd5c..75aa14a0f4 100644
--- a/packages/images/gpe-image.bb
+++ b/packages/images/gpe-image.bb
@@ -24,11 +24,11 @@ GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb
index 2adc88b958..19157b6a5f 100644
--- a/packages/images/maemo-image.bb
+++ b/packages/images/maemo-image.bb
@@ -15,11 +15,11 @@ MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap dosfstools"
 
 XSERVER ?= "xserver-kdrive-omap"
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
 	   meta-maemo \
 	   ${MAEMO_EXTRA_DEPENDS}"
 
-export IPKG_INSTALL = "task-bootstrap maemo-task-base maemo-task-theme \
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \
 	               maemo-task-apps ${MAEMO_EXTRA_INSTALL} \
 		       ${XSERVER}"
 
diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb
index 7836258940..31992e4bc8 100644
--- a/packages/images/mythfront-image.bb
+++ b/packages/images/mythfront-image.bb
@@ -4,7 +4,7 @@ IMAGE_ROOTFS_SIZE_ext2 = "85000"
 IMAGE_ROOTFS_SIZE_ext2.gz = "85000"
 IMAGE_LINGUAS = ""
 
-MYTHFRONT_PACKAGES = "task-bootstrap task-mythfront"
+MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront"
 
 export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}"
 DEPENDS = "${MYTHFRONT_PACKAGES}"
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index c786f67e0b..b7c68ec505 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -6,12 +6,12 @@ FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${D
 LICENSE = "MIT"
 PR = "r21"
 
-DEPENDS = "task-bootstrap task-opie"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie"
 RDEPENDS = "${INSTALL_PACKAGES}"
 
 extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
 
-INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \
+INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} 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 \
diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb
index 0f3254b56e..79c8094f34 100644
--- a/packages/images/sdl-image.bb
+++ b/packages/images/sdl-image.bb
@@ -2,8 +2,8 @@ LICENSE = MIT
 
 export IMAGE_BASENAME = "sdl-image"
 
-DEPENDS = "task-bootstrap task-sdl"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl"
 
-export IPKG_INSTALL = "task-bootstrap sdl-base"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base"
 
 inherit image_ipk
diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb
index be7f28fb91..1ddd022d08 100644
--- a/packages/images/sectest-gpe-image.bb
+++ b/packages/images/sectest-gpe-image.bb
@@ -21,11 +21,11 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb
index 7015f7020c..f609dfd07e 100644
--- a/packages/images/twin-image.bb
+++ b/packages/images/twin-image.bb
@@ -1,13 +1,13 @@
 export IMAGE_BASENAME="twin-image"
 
-DEPENDS = 'task-bootstrap \
+DEPENDS = '${MACHINE_TASK_PROVIDER} \
           twin \
 	  orpheus \
 	  nano \
 	  vim \
 	  mutt'
 
-export IPKG_INSTALL = 'task-bootstrap \
+export IPKG_INSTALL = '${MACHINE_TASK_PROVIDER} \
 		       twin \
 		       orpheus \
 		       nano \
diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb
index 6ebbf04537..5b6981488e 100644
--- a/packages/images/uml-image.bb
+++ b/packages/images/uml-image.bb
@@ -6,7 +6,7 @@ export IMAGE_BASENAME = "uml-image"
 OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2"
 OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 export IPKG_INSTALL = "${DEPENDS}"
 
 inherit image_ipk
diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb
index 5605a6b2ee..f861b9e6dd 100644
--- a/packages/images/xfce-image.bb
+++ b/packages/images/xfce-image.bb
@@ -5,7 +5,7 @@ IMAGE_LINGUAS = ""
 X_DEPENDS = "virtual/xserver"
 X_RDEPENDS = "xserver-kdrive-fbdev"
 
-XFCE_DEPENDS = "task-bootstrap task-xfce-base"
+XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base"
 XFCE_RDEPENDS = "${XFCE_DEPENDS}"
 
 export IPKG_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}"
diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb
index 2b98ec98fc..d6cc7b1640 100644
--- a/packages/images/xterminal-image.bb
+++ b/packages/images/xterminal-image.bb
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "xterminal-image"
 
 IMAGE_LINGUAS = ""
 
-XTERMINAL_PACKAGES = "task-bootstrap task-xterminal"
+XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal"
 
 export IPKG_INSTALL = "${XTERMINAL_PACKAGES}"
 DEPENDS = "${XTERMINAL_PACKAGES}"