merge of 101cc837c8a2d1c2d4abc0f9ed9415554cbb609c

     and 95d8882549c61d28fd1ccd1223c761df50dfcebb

11 files changed, 143 insertions, 41 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 8c84ad282c..f49f26b7da 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -425,3 +425,28 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 # Magic Cookie for SANITY CHECK
 ##################################################################
 OES_BITBAKE_CONF = "1"
+
+##################################################################
+# Task-base stuff
+##################################################################
+
+MACHINE_FEATURES ?= "kernel26"
+DISTRO_FEATURES ?= ""
+
+DISTRO_EXTRA_RDEPENDS ?= ""
+DISTRO_EXTRA_RRECOMMENDS ?= ""
+MACHINE_EXTRA_RDEPENDS ?= ""
+MACHINE_EXTRA_RRECOMMENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+COMBINED_FEATURES = "\
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
+    ${@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)}"
+
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 3243c951dc..91708aba37 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -48,6 +48,7 @@ FEED_ARCH_tosa		= "armv5te"
 #i686 machines
 
 FEED_ARCH_guinness	= "i686"
+FEED_ARCH_progear	= "i686"
 
 FEED_URIS += " \
 		no-arch##${ANGSTROM_URI}/unstable/feed/all \
@@ -153,12 +154,12 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
-PREFERRED_VERSION_linux-libc-headers_guinness ?= "2.6.18"
+PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
 
 PREFERRED_VERSION_glibc ?= "2.5"
 
-PREFERRED_VERSION_glibc-intermediate_guinness ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
 # To use an EABI compatible version 3 series gcc, either uncomment 
@@ -171,9 +172,6 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 # Busybox <1.1.0 doesn't have EABI support
 PREFERRED_VERSION_busybox = "1.2.1"
 
-PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
-PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-
 PREFERRED_VERSION_dbus ?= "1.0.1"
 PREFERRED_VERSION_dbus-glib ?= "0.71"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 20f8be01c1..7f0546c271 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -49,4 +49,4 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
 
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
index d3c77bf9bd..04939da36e 100644
--- a/conf/machine/native.conf
+++ b/conf/machine/native.conf
@@ -11,3 +11,4 @@ ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++ virtual/libc vir
 ASSUME_PROVIDED += "binutils-cross"
 ASSUME_PROVIDED += "virtual/libiconv virtual/libintl virtual/libc"
 
+IMAGE_FSTYPES ?= "tar.gz"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
new file mode 100644
index 0000000000..fb316181d3
--- /dev/null
+++ b/conf/machine/progear.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Progear
+#@DESCRIPTION: Machine configuration for Progear 1050HX+ webpad
+
+# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+TARGET_ARCH = "i686"
+
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 366da828bd..a9b3881444 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -40,30 +40,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # usbgadget
 # usbhost
 
-
-MACHINE_FEATURES ?= "kernel26"
-DISTRO_FEATURES ?= ""
 DISTRO_CORE_PACKAGE ?= "task-base-core-default"
 
-DISTRO_EXTRA_RDEPENDS ?= ""
-DISTRO_EXTRA_RRECOMMENDS ?= ""
-MACHINE_EXTRA_RDEPENDS ?= ""
-MACHINE_EXTRA_RRECOMMENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-
-
-COMBINED_FEATURES = "\
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
-    ${@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)}"
-
-
 #
 # task-base 
 #
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 72c66e7ba8..b421818379 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-opie-everything"
 
-PR = "r3"
+PR = "r4"
 
 PACKAGES = "task-opie-applets task-opie-apps task-opie-base \
             task-opie-base-applets task-opie-base-apps \
@@ -35,16 +35,13 @@ RDEPENDS_task-opie-base = "opie-alarm opie-qcop opie-quicklauncher opie-taskbar
 # things for reasonable bootstrap image
 #
 RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspendapplet \
-                          opie-homeapplet opie-rotateapplet \
-                          opie-irdaapplet opie-brightnessapplet opie-batteryapplet \
-                          opie-pcmciaapplet opie-volumeapplet \
-                          opie-screenshotapplet"
-
-#
-# keyboard models can benefit from the vt and logout applets
-#
-RDEPENDS_task-opie-base-applets_append_openzaurus = " opie-vtapplet opie-logoutapplet"
-RDEPENDS_task-opie-base-applets_append_mnci       = " opie-vtapplet opie-logoutapplet"
+                                   opie-homeapplet opie-rotateapplet \
+		   opie-brightnessapplet opie-volumeapplet \
+                                   opie-screenshotapplet \
+    ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
 #
 # clamshell models can benefit from the autorotate applet
@@ -67,7 +64,9 @@ RDEPENDS_task-opie-base-settings = "opie-packagemanager opie-light-and-power opi
 # That settings can be removed and device will be still usable
 #
 RDEPENDS_task-opie-extra-settings = "opie-language opie-doctab opie-mediummount \
-                            opie-networksettings-wlanplugin opie-networksettings-pppplugin"
+    ${@base_contains("DISTRO_FEATURES", "wifi", "opie-networksettings-wlanplugin", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
+			    "
 
 RDEPENDS_task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty
diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch
new file mode 100644
index 0000000000..795306bb35
--- /dev/null
+++ b/packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch
@@ -0,0 +1,19 @@
+Index: wpa_supplicant-0.5.5/tls_gnutls.c
+===================================================================
+--- wpa_supplicant-0.5.5.orig/tls_gnutls.c	2006-06-25 03:05:07.000000000 +0200
++++ wpa_supplicant-0.5.5/tls_gnutls.c	2006-10-29 15:12:21.000000000 +0100
+@@ -1029,8 +1029,13 @@
+ 				     const u8 *in_data, size_t in_len,
+ 				     size_t *out_len)
+ {
++	u8 *appl_data;
++	size_t appl_data_len;
++
++	appl_data = NULL;
++
+ 	return tls_connection_handshake(ssl_ctx, conn, in_data, in_len,
+-					out_len);
++					out_len, appl_data, appl_data_len);
+ }
+ 
+ 
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
new file mode 100644
index 0000000000..d915cd14f2
--- /dev/null
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
@@ -0,0 +1,62 @@
+DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
+SECTION = "network"
+LICENSE = "GPL"
+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE}', '${TARGET_ARCH}', d)}"
+
+DEFAULT_PREFERENCE = "-2"
+
+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
+	file://defconfig-gnutls \
+	file://init.sh \
+	file://gnutlsfix.patch;patch=1 \
+	file://defaults-sane \
+	file://wpa_supplicant.conf \
+	file://wpa_supplicant.conf-sane"
+
+S = "${WORKDIR}/wpa_supplicant-${PV}"
+
+PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
+FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
+FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli"
+
+RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
+
+INITSCRIPT_NAME = "wpa"
+INITSCRIPT_PARAMS = "defaults 10"
+inherit update-rc.d
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+do_configure () {
+        install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
+ 
+        if [ "x$HAS_PCI" == "x1" ] then; do
+                echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+        fi
+}
+
+do_compile () {
+	make
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 755 wpa_supplicant ${D}${sbindir}
+	install -m 755 wpa_passphrase ${D}${sbindir}
+	install -m 755 wpa_cli        ${D}${sbindir}
+
+	install -d ${D}${localstatedir}/run/wpa_supplicant
+
+	install -d ${D}${docdir}/wpa_supplicant
+	install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
+
+	install -d ${D}${sysconfdir}/init.d
+	install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa
+
+	install -d ${D}${sysconfdir}/default
+	install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
+	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
+}
diff --git a/removal.txt b/removal.txt
index d19c85e8ed..9336079f36 100644
--- a/removal.txt
+++ b/removal.txt
@@ -19,3 +19,8 @@ Package Name:	task-bootstrap*
 Removal Date:	2006-12-12
 Maintainer:	None
 Reason:		Obsoleted by task-base
+
+Package Name:	bluez*2.*
+Removal Date:	2006-12-12
+Maintainer:	None
+Reason:		Obsolete by, and conflicts with bluez 3.7