3 files changed, 7 insertions, 8 deletions
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index b7c68ec505..e22200abc5 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -1,23 +1,21 @@
 export IMAGE_BASENAME = "opie-image"
 export IMAGE_LINGUAS = ""
 
-FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
-
 LICENSE = "MIT"
 PR = "r21"
 
 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 = "${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 \
 		    task-opie-extra-settings \
-		    task-opie-bluetooth task-opie-irda \
-		    ${extra_stuff}"
+		    task-opie-bluetooth task-opie-irda "
+
+INSTALL_PACKAGES_spitz_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles"
+INSTALL_PACKAGES_akita_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles"
 
 export IPKG_INSTALL = "${INSTALL_PACKAGES}"
 
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 1a41f13129..4898e84a33 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -125,6 +125,7 @@ RRECOMMENDS_task-base-core-default = '\
     dropbear '
 
 task-base-kernel24-rdepends = "\
+    modutils-depmod \
     linux-hotplug "
 
 task-base-kernel26-rdepends = "\
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index b421818379..984fa61584 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -5,7 +5,7 @@ ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r4"
+PR = "r5"
 
 PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
             task-opie-base-applets task-opie-base-apps \
@@ -155,7 +155,7 @@ RDEPENDS_task-opie-todayplugins = "opie-today-addressbookplugin opie-today-dateb
 RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
                  opie-mail opie-pimconverter"
 
-RDEPENDS_task-opie-bluetooth = "bluez-utils-nodbus obexftp obexpush libopieobex0 \
+RDEPENDS_task-opie-bluetooth = "bluez-utils obexftp obexpush libopieobex0 \
                        opie-bluepin opie-bluetoothmanager opie-bluetoothapplet"
 
 RDEPENDS_task-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"