3 files changed, 11 insertions, 14 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 9b1f22f2d3..366da828bd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r12"
+PR = "r13"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -17,6 +17,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # apm
 # keyboard
 # touchscreen
+# screen
+# pci
 
 # Valid only in DISTRO_FEATURES:
 #
diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb
index cc14213441..9d8537d0b9 100644
--- a/packages/tasks/task-ossie.bb
+++ b/packages/tasks/task-ossie.bb
@@ -3,13 +3,16 @@ DESCRIPTION = "Meta-package for OSSIE Software Defined Radio (SDR)"
 ALLOW_EMPTY = 1
 PR = "r0"
 
-OSSIE_INSTALL = "screen procps xerces-c omniorb usrp ossiecf ossie-standardinterfaces ossie-nodebooter"
+OSSIE_BASE = "screen procps xerces-c omniorb usrp"
 
-OSSIE_COMPONENTS = "ossie-gpp-device ossie-usrp-device ossie-demo ossie-channeldemo ossie-rxdemo"
+OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader"
 
+OSSIE_COMPONENTS = "ossie-gpp-device ossie-usrp-device ossie-soundout-device ossie-demo ossie-channeldemo ossie-rxdemo"
 
-RDEPENDS = "${OSSIE_INSTALL} ${OSSIE_COMPONENTS}"
 
-IPKG_INSTALL = "${OSSIE_INSTALL}"
+RDEPENDS = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}"
+
+IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS}"
 
 LICENSE = MIT
+
diff --git a/packages/tasks/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb
index 32e319cae3..a1885170e2 100644
--- a/packages/tasks/task-pivotboot.bb
+++ b/packages/tasks/task-pivotboot.bb
@@ -10,15 +10,7 @@ PACKAGES = "${PN}"
 
 MODUTILS ?= "24 26"
 
-def bootstrap_modutils_rdepends(d):
-	import bb
-        m = bb.data.getVar('MODUTILS', d, 1)
-        r = []
-	if '24' in m:
-                r.append('modutils-depmod')
-        if '26' in m:
-                r.append('module-init-tools-depmod')
-        return ' '.join(r)
+require task-bootstrap.inc
 
 HOTPLUG ?= "linux-hotplug"