merge of '440352b74d1975abf361c30e00a2519bd5c8051e'

     and '493bfe4db4e2664b2f5a442c4973208d987e2752'

6 files changed, 12 insertions, 119 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-essential-parts.bb b/packages/tasks/task-essential-parts.bb
deleted file mode 100644
index 82c11537f8..0000000000
--- a/packages/tasks/task-essential-parts.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-parts.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "Creates all task-essential-* tasks"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r1"
-
-######################################################################################
-
-PACKAGE_ARCH = "${MACHINE}"
-ALLOW_EMPTY = 1
-
-PACKAGES = "task-essential-irda task-essential-bluetooth task-essential-bluetooth-all \
-	    task-essential-sound task-essential-sd task-essential-wifi task-essential-wifi-all \
-	    task-essential-usbclient task-essential-usbhost task-essential-pcmcia \
-	    task-essential-userspace task-essential-serial"
-
-######################################################################################
-
-DISTRO_PCMCIA ?= ""
-
-DISTRO_SERIAL ?= ""
-DISTRO_IRDA ?= ""
-DISTRO_BLUETOOTH ?= ""
-DISTRO_SOUND ?= ""
-DISTRO_WIFI ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
-		wireless-tools wpa-supplicant-nossl"
-
-DISTRO_USBCLIENT ?= ""
-DISTRO_USBHOST ?= ""
-
-DISTRO_SD ?= ""
-
-DISTRO_USERSPACE ?= "ipkg keymaps"
-
-DISTRO_DEPENDS ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
-		   ipkg keymaps altboot wireless-tools wpa-supplicant-nossl"
-
-######################################################################################
-
-RDEPENDS_task-essential-serial = "${KMODULES_SERIAL} ${MACHINE_MODUTILS} ${MACHINE_SERIAL} ${DISTRO_SERIAL}"
-RDEPENDS_task-essential-irda = "task-essential-serial ${KMODULES_IRDA} ${MACHINE_MODUTILS} ${MACHINE_IRDA} ${DISTRO_IRDA}"
-RDEPENDS_task-essential-bluetooth = "${KMODULES_BLUETOOTH} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_BLUETOOTH} "
-RDEPENDS_task-essential-bluetooth-all = "task-essential-bluetooth ${KMODULES_BLUETOOTH_DRIVER} ${DISTRO_BLUETOOTH}"
-RDEPENDS_task-essential-pcmcia = "${KMODULES_PCMCIA} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_PCMCIA} ${DISTRO_PCMCIA}"
-RDEPENDS_task-essential-sound = "${KMODULES_SOUND} ${MACHINE_MODUTILS} ${MACHINE_SOUND} ${DISTRO_SOUND}"
-RDEPENDS_task-essential-sd = "${KMODULES_SD} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_SD} ${DISTRO_SD}"
-RDEPENDS_task-essential-wifi = "${KMODULES_WIFI} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_WIFI}"
-RDEPENDS_task-essential-wifi-all = "task-essential-wifi ${KMODULES_WIFI_DRIVER} ${DISTRO_WIFI}"
-RDEPENDS_task-essential-usbclient = "${KMODULES_USBCLIENT} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBCLIENT} ${DISTRO_USBCLIENT}"
-RDEPENDS_task-essential-usbhost = "${KMODULES_USBHOST} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBHOST} ${DISTRO_USBHOST}"
-RDEPENDS_task-essential-userspace = "${DISTRO_USERSPACE}"
-
-
-DEPENDS = "${MACHINE_DEPENDS} ${DISTRO_DEPENDS}"
diff --git a/packages/tasks/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb
deleted file mode 100644
index 565823298a..0000000000
--- a/packages/tasks/task-essential-to-boot.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-to-boot.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "This task includes everything to make a bootable image. And not a bit more."
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-ALLOW_EMPTY = 1
-PACKAGES = "${PN}"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r0"
-
-######################################################################################
-
-CORE_EXTRA_D ?= ""
-CORE_EXTRA_RD ?= ""
-
-CORE_PACKAGES_D = "virtual/kernel base-files base-passwd-3.5.9 busybox initscripts \
-		   sysvinit tinylogin ${CORE_EXTRA_D}"
-
-CORE_PACKAGES_RD = "kernel base-files base-passwd busybox initscripts sysvinit \
-		    tinylogin ${CORE_EXTRA_RD}"
-
-######################################################################################		    
-		    
-DEPENDS = "${CORE_PACKAGES_D}"
-RDEPENDS = "${CORE_PACKAGES_RD}"
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"
 
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index d6a73739f5..e9c263545d 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -74,7 +74,6 @@ RDEPENDS_task-qpe-games = "\
     froot \
     gemdropx \
     glider \
-    gnuz \
     hexatrolic \
     iaimaster \
     icebloxx \
@@ -130,11 +129,6 @@ RDEPENDS_task-qpe-emulators = "scummvm"
 RDEPENDS_task-qpe-fonts = "\
     qpf-bitstream-vera-large \
     qpf-bitstream-vera-sans-mono-huge \
-    qpf-dejavusans \
-    qpf-dejavusanscondensed \
-    qpf-dejavusansmono \
-    qpf-dejavuserif \
-    qpf-dejavuserifcondensed \
     qpf-freemono \
     qpf-freeserif \
     ttf-gentium \