More packages merging with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@390 311d38ba-8fff-0310-9ca6-ca027cbcb966

24 files changed, 2497 insertions, 16 deletions

diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 66d3eb38ff..07753ccf64 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 #use this for a hx2xxx ipaq
 #PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
-
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 ROOT_FLASH_SIZE = "80"
@@ -21,6 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -e 256KiB -p"
 
 MODUTILS = "26"	
+PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
@@ -34,7 +33,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
@@ -47,7 +45,7 @@ HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pc
                   hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
 
 
-
+module_autoload_evdev = "evdev"
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
 module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
diff --git a/openembedded/packages/gcc/gcc_4.0.2.bb b/openembedded/packages/gcc/gcc_4.0.2.bb
index ba64d2421a..540af1cb39 100644
--- a/openembedded/packages/gcc/gcc_4.0.2.bb
+++ b/openembedded/packages/gcc/gcc_4.0.2.bb
@@ -14,4 +14,14 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
+# uclibc patches below
+SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
+                   file://200-uclibc-locale.patch;patch=1 \
+                   file://301-missing-execinfo_h.patch;patch=1 \
+                   file://302-c99-snprintf.patch;patch=1  \
+                   file://303-c99-complex-ugly-hack.patch;patch=1 \
+                   file://800-arm-bigendian.patch;patch=1 \
+                   file://zecke-host-cpp-ac-hack.patch;patch=1 "
+
+
 include gcc4-build.inc
diff --git a/openembedded/packages/lirc/files/lircd.init b/openembedded/packages/lirc/files/lircd.init
index 4bb2b7ee0a..11ce62447f 100755
--- a/openembedded/packages/lirc/files/lircd.init
+++ b/openembedded/packages/lirc/files/lircd.init
@@ -7,6 +7,7 @@
 
 
 test -f /usr/sbin/lircd || exit 0
+test -f /etc/lircd.conf || exit 0
 
 case "$1" in
   start)
diff --git a/openembedded/packages/lirc/files/lircexec.init b/openembedded/packages/lirc/files/lircexec.init
index a9724af0fa..3a8c1a306e 100755
--- a/openembedded/packages/lirc/files/lircexec.init
+++ b/openembedded/packages/lirc/files/lircexec.init
@@ -8,11 +8,12 @@
 
 
 test -f /usr/bin/irexec || exit 0
+test -f /etc/lircrc || exit 0
 
 case "$1" in
   start)
     echo -n "Starting lircexec daemon: irexec"
-    start-stop-daemon --start --quiet --exec /usr/bin/irexec
+    start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon
     echo "."
     ;;
   stop)
@@ -25,7 +26,7 @@ case "$1" in
     start-stop-daemon --stop --quiet --exec /usr/bin/irexec
     sleep 1
     echo -n "Starting lircexec daemon: irexec"
-    start-stop-daemon --start --quiet --exec /usr/bin/irexec
+    start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon
     echo "."
     ;;
   *)
diff --git a/openembedded/packages/mpfr/mpfr_2.1.1.bb b/openembedded/packages/mpfr/mpfr_2.1.1.bb
index 8b739c0803..1bf29fb6b1 100644
--- a/openembedded/packages/mpfr/mpfr_2.1.1.bb
+++ b/openembedded/packages/mpfr/mpfr_2.1.1.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
 DEPENDS = "gmp"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
@@ -15,5 +15,6 @@ do_stage() {
 	       bindir=${STAGING_BINDIR} \
 	       includedir=${STAGING_INCDIR} \
 	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
+	       datadir=${STAGING_DATADIR} \
+	       infodir=${STAGING_DIR}/${HOST_SYS}/info 
 }
diff --git a/openembedded/packages/netbase/netbase/interfaces b/openembedded/packages/netbase/netbase/interfaces
index d7b40dc380..fbeb14ffbc 100644
--- a/openembedded/packages/netbase/netbase/interfaces
+++ b/openembedded/packages/netbase/netbase/interfaces
@@ -16,10 +16,19 @@ iface eth1 inet dhcp
 
 # Ethernet/RNDIS gadget (g_ether)
 # ... or on host side, usbnet and random hwaddr
-iface usb0 inet dhcp
+iface usb0 inet static
+	address 192.168.0.202
+	netmask 255.255.255.0
+	network 192.168.0.0
+	gateway 192.168.0.200
+
 
 # Zaurus 2.4 Lineo net_fd; obsolete
-iface usbd0 inet dhcp
+iface usbd0 inet static
+	address 192.168.129.201
+	netmask 255.255.255.0
+	network 192.168.129.0
+	gateway 192.168.129.200
 
 # iPAQ 2.4 mach-sa1100/usb-eth
 # (192.168.0.202 is the iPAQ's IP, 192.168.0.200 is the host's IP)
diff --git a/openembedded/packages/sharp-binary-only/sharp-flash-header-c700.bb b/openembedded/packages/sharp-binary-only/sharp-flash-header-c700.bb
index c02882482e..789c7c2f01 100644
--- a/openembedded/packages/sharp-binary-only/sharp-flash-header-c700.bb
+++ b/openembedded/packages/sharp-binary-only/sharp-flash-header-c700.bb
@@ -1,6 +1,7 @@
 SECTION = "base"
 SRC_URI = "file://header-c700.bin"
 LICENSE = "sharp-binary-only"
+COMPATIBLE_MACHINE = '(c7x0|spitz|akita)'
 do_stage() {
 	install -d ${STAGING_LIBDIR}/sharp-flash-header
 	install -m 0644 ${WORKDIR}/header-c700.bin ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin
diff --git a/openembedded/packages/startup-notification/startup-notification_0.8.bb b/openembedded/packages/startup-notification/startup-notification_0.8.bb
index 3db849d2ce..36181f4043 100644
--- a/openembedded/packages/startup-notification/startup-notification_0.8.bb
+++ b/openembedded/packages/startup-notification/startup-notification_0.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Startup notification support"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "libx11"
 PR = "r1"
 
@@ -15,5 +15,5 @@ do_configure_prepend () {
 }
 
 do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	autotools_stage_all
 }
diff --git a/openembedded/packages/tslib/tslib/h3900/tslib.sh b/openembedded/packages/tslib/tslib/h3900/tslib.sh
index be9448b1dc..0de3534a51 100644
--- a/openembedded/packages/tslib/tslib/h3900/tslib.sh
+++ b/openembedded/packages/tslib/tslib/h3900/tslib.sh
@@ -11,7 +11,7 @@ case `uname -r` in
 	;;
 *)
 	TSLIB_TSDEVICE=`detect-stylus --device`
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
 esac
 
diff --git a/openembedded/packages/tslib/tslib/simpad/tslib.sh b/openembedded/packages/tslib/tslib/simpad/tslib.sh
index 8bb94a037f..5301239373 100644
--- a/openembedded/packages/tslib/tslib/simpad/tslib.sh
+++ b/openembedded/packages/tslib/tslib/simpad/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
 	;;
 *)
 	TSLIB_TSDEVICE=/dev/input/event0
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad
+	TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 	;;
 esac
 
diff --git a/openembedded/packages/udev/files/mount.sh b/openembedded/packages/udev/files/mount.sh
index 7e641b08d7..48c7844690 100644
--- a/openembedded/packages/udev/files/mount.sh
+++ b/openembedded/packages/udev/files/mount.sh
@@ -8,6 +8,39 @@
 MOUNT="/bin/mount"
 PMOUNT="/usr/bin/pmount"
 UMOUNT="/bin/umount"
+name="`basename "$DEVNAME"`"
+
+for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+do
+	if ( echo "$DEVNAME" | grep -q "$line" )
+	then
+		logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+		exit 0
+	fi
+done
+
+automount() {	
+	! test -d "/media/$name" && mkdir -p "/media/$name"
+	
+	if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name"
+	then
+		#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
+		rm_dir "/media/$name"
+	else
+		logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
+		touch "/tmp/.automount-$name"
+	fi
+}
+	
+rm_dir() {
+	# We do not want to rm -r populated directories
+	if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
+	then
+		! test -z "$1" && rm -r "$1"
+	else
+		logger "mount.sh/automount" "Not removing non-empty directory [$1]"
+	fi
+}
 
 if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
 	if [ -x "$PMOUNT" ]; then
@@ -15,11 +48,20 @@ if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
 	elif [ -x $MOUNT ]; then
     		$MOUNT $DEVNAME 2> /dev/null
 	fi
+	
+	# If the device isn't mounted at this point, it isn't configured in fstab
+	cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount 
+	
 fi
 
+
+
 if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
 	for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
 	do
 		$UMOUNT $mnt
 	done
+	
+	# Remove empty directories from auto-mounter
+	test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
 fi
diff --git a/openembedded/packages/udev/files/network.sh b/openembedded/packages/udev/files/network.sh
index 2cfbfa91b3..5016328df4 100644
--- a/openembedded/packages/udev/files/network.sh
+++ b/openembedded/packages/udev/files/network.sh
@@ -6,6 +6,35 @@ test -x /sbin/cardctl && exit 0
 # We get two "add" events for hostap cards due to wifi0
 echo "$INTERFACE" | grep -q wifi && exit 0
 
+
+# Check if /etc/init.d/network has been run yet to see if we are 
+# called by starting /etc/rcS.d/S03udev and not by hotplugging a device
+#
+# At this stage, network interfaces should not be brought up
+# automatically because:
+# a)	/etc/init.d/network has not been run yet (security issue)
+# b) 	/var has not been populated yet so /etc/resolv,conf points to 
+#	oblivion, making the network unusable
+#
+
+spoofp="`grep ^spoofprotect /etc/network/options`"
+if test -z "$spoofp"
+then
+	# This is the default from /etc/init.d/network
+	spoofp_val=yes
+else
+	spoofp_val=${spoofp#spoofprotect=}
+fi
+
+test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0
+
+# I think it is safe to assume that "lo" will always be there ;)
+if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val"
+then
+	echo "$INTERFACE" >> /dev/udev_network_queue	
+	exit 0
+fi
+
 #
 # Code taken from pcmcia-cs:/etc/pcmcia/network
 #
@@ -15,7 +44,7 @@ echo "$INTERFACE" | grep -q wifi && exit 0
 if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then
   case $ACTION in
     add)
-    	ifup $INTERFACE
+    	ifconfig | grep -q "^$INTERFACE" || ifup $INTERFACE
     	;;
     remove)
     	ifdown $INTERFACE
diff --git a/openembedded/packages/wpa-supplicant/files/defaults-sane b/openembedded/packages/wpa-supplicant/files/defaults-sane
new file mode 100644
index 0000000000..67c4cbddf8
--- /dev/null
+++ b/openembedded/packages/wpa-supplicant/files/defaults-sane
@@ -0,0 +1,8 @@
+# Useful flags:
+#  -i <ifname>          Interface (required, unless specified in config)
+#  -D <driver>          Wireless Driver
+#  -d                   Debugging (-dd for more)
+#  -q                   Quiet (-qq for more)
+
+CONFIG="/etc/wpa_supplicant.conf"
+OPTIONS="-i eth1 -D wext"
diff --git a/openembedded/packages/wpa-supplicant/files/defconfig-gnutls b/openembedded/packages/wpa-supplicant/files/defconfig-gnutls
new file mode 100644
index 0000000000..2df5e51df8
--- /dev/null
+++ b/openembedded/packages/wpa-supplicant/files/defconfig-gnutls
@@ -0,0 +1,176 @@
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+CFLAGS = $(TARGET_CFLAGS) -I../hostapd -I../utils -I../driver/modules -Wall -MMD
+LIBS = $(TARGET_LDFLAGS)
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for Agere driver
+#CONFIG_DRIVER_HERMES=n
+
+# Driver interface for madwifi driver
+#CONFIG_DRIVER_MADWIFI=y
+
+# Driver interface for Prism54 driver
+#CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for ndiswrapper
+#CONFIG_DRIVER_NDISWRAPPER=y
+
+# Driver interface for Atmel driver
+#CONFIG_DRIVER_ATMEL=y
+
+# Driver interface for Broadcom driver
+#CONFIG_DRIVER_BROADCOM=y
+
+# Driver interface for Intel ipw2100 driver
+#CONFIG_DRIVER_IPW2100=y
+
+# Driver interface for generic Linux wireless extensions
+CONFIG_DRIVER_WEXT=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# Driver interface for development testing
+#CONFIG_DRIVER_TEST=y
+
+# Driver interface for wired Ethernet drivers
+CONFIG_DRIVER_WIRED=y
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
+# included)
+CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5 (automatically included if EAP-TTLS is enabled)
+CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2 (automatically included if EAP-PEAP is enabled)
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+CONFIG_EAP_TTLS=y
+
+# EAP-GTC
+CONFIG_EAP_GTC=y
+
+# EAP-OTP
+CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+#CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-PAX
+#CONFIG_EAP_PAX=y
+
+# LEAP
+CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+#CONFIG_EAP_AKA=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
+# engine.
+CONFIG_SMARTCARD=y
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
+#CONFIG_PCSC=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
+
+# Replace native Linux implementation of packet sockets with libdnet/libpcap.
+# This will be automatically set for non-Linux OS.
+#CONFIG_DNET_PCAP=y
+
+# Include control interface for external programs, e.g, wpa_cli
+CONFIG_CTRL_IFACE=y
+
+# Include support for GNU Readline and History Libraries in wpa_cli.
+# When building a wpa_cli binary for distribution, please note that these
+# libraries are licensed under GPL and as such, BSD license may not apply for
+# the resulting binary.
+#CONFIG_READLINE=y
+
+# Remove debugging code that is printing out debug message to stdout.
+# This can be used to reduce the size of the wpa_supplicant considerably
+# if debugging code is not needed. The size reduction can be around 35%
+# (e.g., 90 kB).
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
+# 35-50 kB in code size.
+#CONFIG_NO_WPA=y
+
+# Select configuration backend:
+# file = text file (e.g., wpa_supplicant.conf)
+# winreg = Windows registry (see win_example.reg for an example)
+CONFIG_BACKEND=file
+
+# Select program entry point implementation:
+# main = UNIX/POSIX like main() function (default)
+# main_winsvc = Windows service (read parameters from registry)
+# main_none = Very basic example (development use only)
+#CONFIG_MAIN=main
+
+# Select wrapper for operatins system and C library specific functions
+# unix = UNIX/POSIX like systems (default)
+# win32 = Windows systems
+# none = Empty template
+#CONFIG_OS=unix
+
+# Select event loop implementation
+# eloop = select() loop (default)
+# eloop_win = Windows events and WaitForMultipleObject() loop
+# eloop_none = Empty template
+#CONFIG_ELOOP=eloop
+
+# Select layer 2 packet implementation
+# linux = Linux packet socket (default)
+# pcap = libpcap/libdnet/WinPcap
+# freebsd = FreeBSD libpcap
+# winpcap = WinPcap with receive thread
+# none = Empty template
+#CONFIG_L2_PACKET=linux
+
+# IEEE 802.11i/IEEE 802.11e STAKey negotiation for direct link connection
+#CONFIG_STAKEY=y
+
+# Select TLS implementation
+# openssl = OpenSSL (default)
+# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
+# none = Empty template
+CONFIG_TLS=gnutls
+
+# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
+# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
+# even though the core GnuTLS library is released under LGPL, this extra
+# library uses GPL and as such, the terms of GPL apply to the combination
+# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
+# apply for distribution of the resulting binary.
+CONFIG_GNUTLS_EXTRA=y
+
diff --git a/openembedded/packages/wpa-supplicant/files/slugos/defaults-sane b/openembedded/packages/wpa-supplicant/files/slugos/defaults-sane
new file mode 100644
index 0000000000..df4268b3a6
--- /dev/null
+++ b/openembedded/packages/wpa-supplicant/files/slugos/defaults-sane
@@ -0,0 +1,8 @@
+# Useful flags:
+#  -i <ifname>          Interface (required, unless specified in config)
+#  -D <driver>          Wireless Driver
+#  -d                   Debugging (-dd for more)
+#  -q                   Quiet (-qq for more)
+
+CONFIG="/etc/wpa_supplicant.conf"
+OPTIONS="-i ath0 -D madwifi"
diff --git a/openembedded/packages/wpa-supplicant/files/wpa_supplicant.conf-sane b/openembedded/packages/wpa-supplicant/files/wpa_supplicant.conf-sane
new file mode 100644
index 0000000000..c91ffe0c84
--- /dev/null
+++ b/openembedded/packages/wpa-supplicant/files/wpa_supplicant.conf-sane
@@ -0,0 +1,7 @@
+ctrl_interface=/var/run/wpa_supplicant
+ctrl_interface_group=0
+update_config=1
+
+network={
+        key_mgmt=NONE
+}
diff --git a/openembedded/packages/wpa-supplicant/wpa-supplicant-0.4.7/defconfig b/openembedded/packages/wpa-supplicant/wpa-supplicant-0.4.7/defconfig
new file mode 100644
index 0000000000..0e45d01b88
--- /dev/null
+++ b/openembedded/packages/wpa-supplicant/wpa-supplicant-0.4.7/defconfig
@@ -0,0 +1,160 @@
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+CFLAGS = $(TARGET_CFLAGS) -I../hostapd -I../utils -I../driver/modules -Wall -MMD
+
+# for wpa_supplicant, wpa_cli
+LIBS = $(TARGET_LDFLAGS)
+
+# for wpa_passphrase:
+LIBS_p = $(TARGET_LDFLAGS)
+
+
+# Uncomment following two lines and fix the paths if you have installed openssl
+# in non-default location
+#CFLAGS += -I/usr/local/openssl/include
+#LIBS += -L/usr/local/openssl/lib
+
+# Example configuration for various cross-compilation platforms
+
+#### sveasoft (e.g., for Linksys WRT54G) ######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
+#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
+###############################################################################
+
+#### openwrt (e.g., for Linksys WRT54G) #######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
+#	-I../WRT54GS/release/src/include
+#LIBS = -lssl
+###############################################################################
+
+
+# Driver interface for Host AP driver
+#CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for Agere driver
+#CONFIG_DRIVER_HERMES=y
+
+# Driver interface for madwifi driver
+#CONFIG_DRIVER_MADWIFI=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../madwifi/wpa
+
+# Driver interface for Prism54 driver
+#CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for ndiswrapper
+#CONFIG_DRIVER_NDISWRAPPER=y
+
+# Driver interface for Atmel driver
+#CONFIG_DRIVER_ATMEL=y
+
+# Driver interface for Broadcom driver
+#CONFIG_DRIVER_BROADCOM=y
+# Example path for wlioctl.h; change to match your configuration
+#CFLAGS += -I/opt/WRT54GS/release/src/include
+
+# Driver interface for Intel ipw2100 driver
+#CONFIG_DRIVER_IPW2100=y
+
+# Driver interface for the Zydas zd1211 driver
+CONFIG_DRIVER_ZD1211=y
+
+# Driver interface for generic Linux wireless extensions
+CONFIG_DRIVER_WEXT=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# Driver interface for Windows NDIS
+#CONFIG_DRIVER_NDIS=y
+#CFLAGS += -I/usr/include/w32api/ddk
+#LIBS += -L/usr/local/lib
+# For native build using mingw
+#CONFIG_NATIVE_WINDOWS=y
+# Additional directories for cross-compilation on Linux host for mingw target
+#CFLAGS += -I/opt/mingw/mingw32/include/ddk
+#LIBS += -L/opt/mingw/mingw32/lib
+#CC=mingw32-gcc
+
+# Driver interface for development testing
+#CONFIG_DRIVER_TEST=y
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
+# included)
+CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5 (automatically included if EAP-TTLS is enabled)
+CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2 (automatically included if EAP-PEAP is enabled)
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+CONFIG_EAP_TTLS=y
+
+# EAP-GTC
+CONFIG_EAP_GTC=y
+
+# EAP-OTP
+CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+#CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# LEAP
+CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+#CONFIG_EAP_AKA=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
+#CONFIG_PCSC=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
+
+# Replace native Linux implementation of packet sockets with libdnet/libpcap.
+# This will be automatically set for non-Linux OS.
+#CONFIG_DNET_PCAP=y
+
+# Include control interface for external programs, e.g, wpa_cli
+CONFIG_CTRL_IFACE=y
+
+# Include interface for using external supplicant (Xsupplicant) for EAP
+# authentication
+#CONFIG_XSUPPLICANT_IFACE=y
+
+# Include support for GNU Readline and History Libraries in wpa_cli.
+# When building a wpa_cli binary for distribution, please note that these
+# libraries are licensed under GPL and as such, BSD license may not apply for
+# the resulting binary.
+#CONFIG_READLINE=y
diff --git a/openembedded/packages/wpa-supplicant/wpa-supplicant-0.4.7/driver-hermes.patch b/openembedded/packages/wpa-supplicant/wpa-supplicant-0.4.7/driver-hermes.patch
new file mode 100644
index 0000000000..4044835e1c
--- /dev/null
+++ b/openembedded/packages/wpa-supplicant/wpa-supplicant-0.4.7/driver-hermes.patch
@@ -0,0 +1,884 @@
+--- /dev/null
++++ wpa_supplicant-0.4.7/driver_hermes.c
+@@ -0,0 +1,705 @@
++/*
++ * WPA Supplicant - testing driver interface
++ * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * Alternatively, this software may be distributed under the terms of BSD
++ * license.
++ *
++ * See README and COPYING for more details.
++ */
++
++#include <stdlib.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++#include <sys/ioctl.h>
++#include <errno.h>
++#include <net/if_arp.h>
++
++#include "wireless_copy.h"
++#include "common.h"
++#include "driver.h"
++
++#include "eloop.h"
++#include "wpa_supplicant.h"
++#include "priv_netlink.h"
++
++#include "hostap_common.h"
++#include "driver_wext.h"
++#include "driver_hermes.h"
++
++
++
++/* Enumeration for supported Hermes Types */
++enum
++{
++    WL_HERMES_UNKNOWN = 0,
++    WL_HERMES_1       = 1,
++    WL_HERMES_2       = 2,
++    WL_HERMES_25      = 3
++};
++
++
++
++
++struct wpa_driver_hermes_data {
++	void *wext; /* private data for driver_wext */
++	void *ctx;
++	char ifname[IFNAMSIZ + 1];
++	int sock;
++	int type;
++};
++
++
++
++/****************************************************************************/
++/*                                                                          */
++/* Routines for basic device access to Agere Hermes-I/Hermes-II via the UIL */
++/*                                                                          */
++/****************************************************************************/
++
++IFBP _connect(void *priv)
++{
++        struct wpa_driver_hermes_data *drv = priv;
++	int		result = 0;
++	IFBP		ifbp = NULL;
++	struct uilreq	urq;
++
++	//wpa_printf(MSG_DEBUG, "%s: %s %d", __FUNCTION__, drv->ifname, drv->sock);
++