merge of '2af10c8f8ecac83cfb23286aebb3172d45a4a12f'

     and '51b5481655e96906c986a4ff927a78ce129f0109'

10 files changed, 29 insertions, 18 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4336704a3c..f137c2116c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,14 +4,15 @@ Please put you full name and email-address here for the areas of OE you want to
 
 Note: For the hard of thinking, this list is meant to remain in alphabetical
 order. If you could add yourselves to it in alphabetical order that would be
-so much easier.
+so much easier (sort by firstname).
 
 Person:     Real name
 Mail:       Mail patches to
 Website:    Web-page
+Interests:  Areas of interest (e.g. subsystems)
 Distros:    Maintained distros
 Machines:   Maintained machines
-Recipes:    Maintained recipes (subsystems first, then single ones)
+Recipes:    Maintained recipes (should match package names, can include wildcards)
 
 -----------------------------------------------------------------------------
 
@@ -27,9 +28,9 @@ Mail:       koen@openembedded.org
 Website:    http://dominion.kabel.utwente.nl/koen/cms
 Machines:   h2200, ipaq-pxa270, efika, ep93xx, netbook-pro
 Distros:    Ångström
-Recipes:    OpenSync,, GNOME, GPE, Matchbox
+Interests:  OpenSync, GNOME, GPE, Matchbox
 Recipes:    abiword, bootchart, dia, farsight, freeciv, fuse, galago, geda, gimp, 
-Recipes:    gnumeric, (g)obby, imposter, inkscape
+Recipes:    gnumeric, gobby, obby, imposter, inkscape
 Recipes:    telepathy, tilibs, xchat, xournal. 
 
 Person:     Marcin Juszkiewicz
@@ -37,13 +38,13 @@ Mail:       hrw@openembedded.org
 Website:    http://www.hrw.one.pl/
 Machines:   collie, spitz
 Distros:    OpenZaurus
-Recipes:    OPIE, HostAP, Orinoco, WPA-Supplicant, Wireless tools, Keymaps, OpenZaurus 2.6 kernels
-Recipes:    Qtopia fonts, DejaVu fonts, Native SDK
-Recipes:    kdepimpi, subapplet, corsair, gammu, iqnotes, zbedic
+Interests:  OPIE, Qtopia fonts, Native SDK
+Recipes:    hostap*, orinoco*, wpa-supplicant*, wireless-tools, keymaps, qpf-dejavu*
+Recipes:    kdepimpi, subapplet, corsair, gammu, iqnotes, zbedic, linux-openzaurus 
 
 Person:     Leon Woestenberg
 Mail:       leonw@mailcan.com
-Recipes:    SquashFS, LZMA
+Interests:  SquashFS, LZMA
 
 Person:     Joaquim Duran
 Mail:       joaquinduran@adtelecom.es
@@ -58,3 +59,10 @@ Recipes:    ccxstream, eciadsl, ssmtp, gstreamer, ixp4xx-npe, joe
 Recipes:    lcdproc, libol, mailx, mysql, musicpd, openntpd, qc-usb
 Recipes:    radlib, scsi-idle, rng-tools, slugos-init, syslog-ng
 Recipes:    vsftpd, zd1211, wpa-supplicant
+
+Person:     Richard Purdie
+Mail:       rpurdie@rpsys.net
+Distros:    poky, openzaurus, Ångström
+Machines:   poodle, c7x0, spitz, nokia770, qemuarm, qemux86, hx2xxx
+Interests:  Kernels, Bitbake, Core OE infrastructure, Zaurus 2.6
+Recipes:    linux-openzaurus, udev, zaurusd, task-base
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index d81def55a6..64c1bc0a0c 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -86,7 +86,7 @@ def check_sanity(e):
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
-			raise_sanity_error( "Please install the %s utility." )
+			raise_sanity_error( "Please install the %s utility." % util )
 
 	oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
 	if not oes_bb_conf:
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index b4dde3d0e2..1c76ef870b 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -12,7 +12,7 @@
 # Bruno Randolf <bruno.randolf@4g-systems.biz>
 
 INHERIT += "package_ipk debian nylon-mirrors"
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index b11e447ea0..3f3b2f916e 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -14,7 +14,7 @@ HANDHELD_MODULES = ""
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 65cce6ce81..485bb88892 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -5,7 +5,7 @@
 KERNEL ?= "kernel24"
 #KERNEL ?= "kernel26"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 OVERRIDES =. "${KERNEL}:"
 
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index 9ac43d84e9..d4cd4c1d79 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -20,4 +20,4 @@ input uinput \
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils  wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf
index bd5983cdc0..70beba2562 100644
--- a/conf/machine/include/smartphone-common.conf
+++ b/conf/machine/include/smartphone-common.conf
@@ -18,4 +18,4 @@ input uinput \
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
diff --git a/conf/machine/include/thinclient-common.conf b/conf/machine/include/thinclient-common.conf
index 4a96b42525..16f7702d91 100644
--- a/conf/machine/include/thinclient-common.conf
+++ b/conf/machine/include/thinclient-common.conf
@@ -16,4 +16,4 @@ input uinput \
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index c480cf4ebf..08bb29189d 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -2,7 +2,7 @@
 #@Name: Psion teklogix netbookpro Platform
 #@DESCRIPTION: Machine configuration for Psion teklogix netbookpro Platformm
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv5te"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 02669ec2db..50ca203b9a 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 = "r8"
+PR = "r9"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -33,6 +33,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # bluetooth
 # ext2
 # irda
+# pci
 # pcmcia
 # usbgadget
 # usbhost
@@ -56,6 +57,7 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}"
 
@@ -257,7 +259,8 @@ task-distro-ipsec-rrecommends = "\
 
 task-distro-wifi-rdepends = "\
     wireless-tools \
-    hostap-utils \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
     wpa-supplicant"
 
 task-distro-wifi-rrecommends = "\