merge of 6c249e86f20cab16da75a620e43f22520d6b1f7b

     and 83403a57c1ba58c63ed272bbb6ca23babd62ba37

19 files changed, 156 insertions, 176 deletions

diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 168b7dec4e..290166bb03 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -42,16 +42,9 @@ def tinder_send_http(da, header, log):
     import httplib, urllib
     cont = "\n%s\n%s" % ( header, log)
     headers = {"Content-type": "multipart/form-data" }
-    print cont
 
     conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True))
     conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers)
-
-    resp = conn.getresponse()
-    print resp.status, resp.reason
-    data = resp.read()
-    print data
-
     conn.close() 
 
 
diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf
index d4fedda6e2..de8d7f92a1 100644
--- a/conf/distro/openslug-native-packages.conf
+++ b/conf/distro/openslug-native-packages.conf
@@ -1,7 +1,8 @@
 # automatically generated by bitbake freeze
 BBFILES := "\
-${PKGDIR}/packages/vlan/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
+${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/meta/*.bb \
+${PKGDIR}/packages/vlan/*.bb \
 ${OPENSLUG_EXTRA_BBFILES}"
 # I don't know of any packages we currently need to compile nativly, so this is something to test with
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
index a366aa7688..708bbf1360 100644
--- a/conf/distro/openslug-native.conf
+++ b/conf/distro/openslug-native.conf
@@ -2,9 +2,18 @@ include conf/distro/openslug.conf
 
 # Corresponting packages should be in openslug-native.bb,
 # currently missing: ipkg-utils libtool quilt pkgconfig
-ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native \
-		   quilt-native ipkg-utils-native gnu-config-native pkgconfig-native \
-		   virtual/armeb-linux-gcc virtual/libc update-rc.d"
+ASSUME_PROVIDED = "libtool-cross \
+		   libtool-native \
+		   automake-native \
+		   autoconf-native \
+		   quilt-native \
+		   ipkg-native \
+		   gnu-config-native \
+		   pkgconfig-native \
+		   virtual/armeb-linux-gcc \
+		   virtual/libc \
+		   update-rc.d \
+		   "
 
 # Our build host is armeb, not armv5eb that the kernel reports
 BUILD_ARCH = armeb
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 8719894e6a..25ea543f29 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -53,6 +53,7 @@ ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hotplug-ng/*.bb \
 ${PKGDIR}/packages/initscripts/*.bb \
 ${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/iperf/*.bb \
 ${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/ipkg/*.bb \
 ${PKGDIR}/packages/ircp/*.bb \
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index 739950ed1a..80373e3a1b 100644
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
 SECTION = "console/network"
 LICENSE = "MIT"
 DEPENDS = "zlib"
-PR = "r2"
+PR = "r3"
 PROVIDES = "ssh sshd"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
@@ -41,10 +41,6 @@ do_install() {
 		   ${D}${localstatedir}
 
 	install -m 0755 dropbearmulti ${D}${sbindir}/
-#	for i in ${BINCOMMANDS}
-#	do
-#		ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
-#	done
 	ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
 	
 	for i in ${SBINCOMMANDS}
@@ -71,4 +67,6 @@ pkg_postrm_append () {
   if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
         rm ${sysconfdir}/dropbear/dropbear_dss_host_key
   fi
+  update-alternatives --remove ssh ${bindir}/dropbearmulti
+  update-alternatives --remove scp ${bindir}/dropbearmulti
 }
diff --git a/packages/gpe-login/gpe-login_0.80.bb b/packages/gpe-login/gpe-login_0.80.bb
new file mode 100644
index 0000000000..594bde73c3
--- /dev/null
+++ b/packages/gpe-login/gpe-login_0.80.bb
@@ -0,0 +1,11 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+MAINTAINER  = "Philip Blundell <pb@handhelds.org>"
+DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS    = "xkbd"
+RPROVIDES   = "gpe-session-starter"
+PR = "r0"
diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle
index 6102a630c0..e318a9f427 100644
--- a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle
+++ b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle
@@ -123,6 +123,8 @@ CONFIG_ARCH_PXA_POODLE=y
 # CONFIG_ARCH_PXA_SHEPHERD is not set
 # CONFIG_ARCH_PXA_HUSKY is not set
 # CONFIG_ARCH_PXA_BOXER is not set
+# CONFIG_ARCH_PXA_TOSA is not set
+# CONFIG_ARCH_PXA_TOSA_SKIP is not set
 CONFIG_ARCH_SHARP_SL=y
 CONFIG_SL_CCCR_CHANGE=y
 CONFIG_SL_CCCR242=y
@@ -389,6 +391,7 @@ CONFIG_NET_IPGRE=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+# CONFIG_IPSEC is not set
 
 #
 # Network device support
@@ -581,12 +584,12 @@ CONFIG_BLK_DEV_IDECS=y
 #
 # Input core support
 #
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_KEYBDEV is not set
+CONFIG_INPUT=m
+CONFIG_INPUT_KEYBDEV=m
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_UINPUT=m
 
 #
 # Character devices
@@ -597,8 +600,14 @@ CONFIG_SERIAL=y
 # CONFIG_SERIAL_CONSOLE is not set
 CONFIG_SERIAL_SL_SERIES=y
 # CONFIG_SL_TS_PRESSURE is not set
+# CONFIG_BOOT_PRESSURE_ON is not set
 # CONFIG_SL7X0_POWER_KEY_OFF is not set
+# CONFIG_BOOT_POWER_KEY_OFF is not set
 # CONFIG_SL_3BUTTON_PATCH is not set
+# CONFIG_BOOT_3BUTTON_PATCH_ON is not set
+# CONFIG_SL_WRITE_TS is not set
+# CONFIG_BLUETOOTH_SL is not set
+# CONFIG_KBD_DEV_FILE is not set
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
@@ -653,6 +662,32 @@ CONFIG_UNIX98_PTY_COUNT=256
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
+# CONFIG_INPUT_NS558 is not set
+# CONFIG_INPUT_LIGHTNING is not set
+# CONFIG_INPUT_PCIGAME is not set
+# CONFIG_INPUT_CS461X is not set
+# CONFIG_INPUT_EMU10K1 is not set
+# CONFIG_INPUT_SERIO is not set
+# CONFIG_INPUT_SERPORT is not set
+# CONFIG_INPUT_ANALOG is not set
+# CONFIG_INPUT_A3D is not set
+# CONFIG_INPUT_ADI is not set
+# CONFIG_INPUT_COBRA is not set
+# CONFIG_INPUT_GF2K is not set
+# CONFIG_INPUT_GRIP is not set
+# CONFIG_INPUT_INTERACT is not set
+# CONFIG_INPUT_TMDC is not set
+# CONFIG_INPUT_SIDEWINDER is not set
+# CONFIG_INPUT_IFORCE_USB is not set
+# CONFIG_INPUT_IFORCE_232 is not set
+# CONFIG_INPUT_WARRIOR is not set
+# CONFIG_INPUT_MAGELLAN is not set
+# CONFIG_INPUT_SPACEORB is not set
+# CONFIG_INPUT_SPACEBALL is not set
+# CONFIG_INPUT_STINGER is not set
+# CONFIG_INPUT_DB9 is not set
+# CONFIG_INPUT_GAMECON is not set
+# CONFIG_INPUT_TURBOGRAFX is not set
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -664,6 +699,7 @@ CONFIG_UNIX98_PTY_COUNT=256
 # CONFIG_RTC is not set
 CONFIG_COTULLA_RTC=y
 CONFIG_ADS7846_TS=y
+# CONFIG_TOSA_TS is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -857,6 +893,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FB_POODLE=y
 CONFIG_POODLE_CONSISTENT_ALLOC=y
 # CONFIG_FB_CORGI is not set
+# CONFIG_FB_TOSA is not set
 # CONFIG_SHARP_LOGO_SCREEN is not set
 # CONFIG_SL_SYSCLK100 is not set
 # CONFIG_FB_CYBER2000 is not set
@@ -887,6 +924,7 @@ CONFIG_FBCON_FONTS=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_5x8 is not set
 CONFIG_FONT_4x6=y
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
@@ -921,6 +959,8 @@ CONFIG_SOUND=y
 # CONFIG_SOUND_PXA_AC97 is not set
 CONFIG_SOUND_POODLE=y
 # CONFIG_SOUND_CORGI is not set
+# CONFIG_SOUND_TOSA is not set
+# CONFIG_BUZZER_TOSA is not set
 # CONFIG_SOUND_TVMIXER is not set
 
 #
@@ -945,6 +985,8 @@ CONFIG_USB=m
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
 # CONFIG_USB_OHCI_SA1111 is not set
+# CONFIG_USB_OHCI_TC6393 is not set
+# CONFIG_USB_USE_INTERNAL_MEMORY is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -957,6 +999,11 @@ CONFIG_USB=m
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_WACOM is not set
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
@@ -1073,6 +1120,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+# CONFIG_BLUEZ_HIDP is not set
 
 #
 # Bluetooth device drivers
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index acaeb5b189..548d87c1a2 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -7,7 +7,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20031107"
-PR = "r40"
+PR = "r41"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
@@ -42,8 +42,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
            file://1764-1.patch;patch=1 \
            file://module_licence.patch;patch=1 \
-           file://iw249_we16-6.diff;patch=1 \
-           file://iw249_we17-13.diff;patch=1 \
+           http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \
+           http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we17-13.diff;patch=1 \
            file://ir240_sys_max_tx-2.diff;patch=1 \
            file://ir241_qos_param-2.diff;patch=1 \
            http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz \
diff --git a/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
index 531c7385e3..6f0bf1e10d 100644
--- a/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
+++ b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_ARM=y
 # CONFIG_EISA is not set
@@ -46,10 +46,6 @@ CONFIG_ARCH_SA1100=y
 #
 # Archimedes/A5000 Implementations
 #
-
-#
-# Archimedes/A5000 Implementations (select only ONE)
-#
 # CONFIG_ARCH_ARC is not set
 # CONFIG_ARCH_A5K is not set
 
@@ -146,10 +142,6 @@ CONFIG_ARCH_SHARP_SL=y
 # CONFIG_FOOTBRIDGE_ADDIN is not set
 CONFIG_CPU_32=y
 # CONFIG_CPU_26 is not set
-
-#
-# Processor Type
-#
 # CONFIG_CPU_32v3 is not set
 CONFIG_CPU_32v4=y
 # CONFIG_CPU_ARM610 is not set
@@ -191,10 +183,6 @@ CONFIG_NET=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-
-#
-# At least one math emulation must be selected
-#
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_KCORE_ELF=y
@@ -209,7 +197,7 @@ CONFIG_APM_CPU_IDLE=y
 CONFIG_APM_DISPLAY_BLANK=y
 CONFIG_APM_RTC_IS_GMT=y
 # CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="See OE File"
+CONFIG_CMDLINE="<see openzaurus-sa_*.bb file in OpenEmbedded metadata>"
 # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set
 # CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
@@ -234,10 +222,6 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_CACKO_HYBRID_PARTITIONS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
@@ -288,17 +272,10 @@ CONFIG_MTD_SA1100=y
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDROM_SA1100 is not set
-CONFIG_MTD_MTDRAM_SA1100=y
-CONFIG_MTDRAM_TOTAL_SIZE=16384
-CONFIG_MTDRAM_ERASE_SIZE=1
-CONFIG_MTDRAM_ABS_POS=C1000000
+# CONFIG_MTD_MTDRAM_SA1100 is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_MTDRAM_SHARP_SL is not set
 # CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
 # CONFIG_MTD_DOC1000 is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
@@ -418,10 +395,6 @@ CONFIG_IP6_NF_TARGET_MARK=m
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
-
-#
-#  
-#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -440,10 +413,6 @@ CONFIG_IP6_NF_TARGET_MARK=m
 #
 # CONFIG_NET_SCHED is not set
 CONFIG_IPSEC=m
-
-#
-# IPSec options (Openswan)
-#
 CONFIG_IPSEC_IPIP=y
 CONFIG_IPSEC_AH=y
 # CONFIG_IPSEC_AUTH_HMAC_MD5 is not set
@@ -452,6 +421,8 @@ CONFIG_IPSEC_ESP=y
 CONFIG_IPSEC_ENC_3DES=y
 # CONFIG_IPSEC_ENC_AES is not set
 CONFIG_IPSEC_ALG=y
+# CONFIG_IPSEC_ALG_AES is not set
+# CONFIG_IPSEC_ALG_CRYPTOAPI is not set
 CONFIG_IPSEC_IPCOMP=y
 CONFIG_IPSEC_DEBUG=y
 
@@ -525,10 +496,6 @@ CONFIG_NET_RADIO=y
 # CONFIG_AIRONET4500_PROC is not set
 # CONFIG_AIRO is not set
 # CONFIG_HERMES is not set
-
-#
-# Wireless Pcmcia cards support
-#
 # CONFIG_PCMCIA_HERMES is not set
 # CONFIG_AIRO_CS is not set
 CONFIG_NET_WIRELESS=y
@@ -575,18 +542,10 @@ CONFIG_NET_PCMCIA_RADIO=y
 # IrDA (infrared) support
 #
 CONFIG_IRDA=y
-
-#
-# IrDA protocols
-#
 # CONFIG_IRLAN is not set
 CONFIG_IRNET=m
 CONFIG_IRCOMM=y
 # CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
 # CONFIG_IRDA_CACHE_LAST_LSAP is not set
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -594,21 +553,9 @@ CONFIG_IRDA_FAST_RR=y
 #
 # Infrared-port device drivers
 #
-
-#
-# SIR device drivers
-#
 CONFIG_IRTTY_SIR=y
 CONFIG_IRPORT_SIR=y
-
-#
-# Dongle support
-#
 # CONFIG_DONGLE is not set
-
-#
-# FIR device drivers
-#
 # CONFIG_USB_IRDA is not set
 # CONFIG_NSC_FIR is not set
 # CONFIG_WINBOND_FIR is not set
@@ -627,10 +574,6 @@ CONFIG_IDE=y
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_IDEDISK=y
@@ -649,10 +592,6 @@ CONFIG_BLK_DEV_IDECS=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
-
-#
-# IDE chipset support/bugfixes
-#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -686,12 +625,12 @@ CONFIG_BLK_DEV_IDECS=y
 #
 # Input core support
 #
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_KEYBDEV is not set
+CONFIG_INPUT=m
+CONFIG_INPUT_KEYBDEV=m
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_UINPUT=m
 
 #
 # Character devices
@@ -748,10 +687,6 @@ CONFIG_UNIX98_PTY_COUNT=32
 # CONFIG_L3 is not set
 # CONFIG_L3_ALGOBIT is not set
 # CONFIG_L3_BIT_SA1100_GPIO is not set
-
-#
-# Other L3 adapters
-#
 # CONFIG_L3_SA1111 is not set
 # CONFIG_BIT_SA1100_GPIO is not set
 
@@ -765,14 +700,32 @@ CONFIG_UNIX98_PTY_COUNT=32
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
-
-#
-# Input core support is needed for gameports
-#
-
-#
-# Input core support is needed for joysticks
-#
+# CONFIG_INPUT_NS558 is not set
+# CONFIG_INPUT_LIGHTNING is not set
+# CONFIG_INPUT_PCIGAME is not set
+# CONFIG_INPUT_CS461X is not set
+# CONFIG_INPUT_EMU10K1 is not set
+# CONFIG_INPUT_SERIO is not set
+# CONFIG_INPUT_SERPORT is not set
+# CONFIG_INPUT_ANALOG is not set
+# CONFIG_INPUT_A3D is not set
+# CONFIG_INPUT_ADI is not set
+# CONFIG_INPUT_COBRA is not set
+# CONFIG_INPUT_GF2K is not set
+# CONFIG_INPUT_GRIP is not set
+# CONFIG_INPUT_INTERACT is not set
+# CONFIG_INPUT_TMDC is not set
+# CONFIG_INPUT_SIDEWINDER is not set
+# CONFIG_INPUT_IFORCE_USB is not set
+# CONFIG_INPUT_IFORCE_232 is not set
+# CONFIG_INPUT_WARRIOR is not set
+# CONFIG_INPUT_MAGELLAN is not set
+# CONFIG_INPUT_SPACEORB is not set
+# CONFIG_INPUT_SPACEBALL is not set
+# CONFIG_INPUT_STINGER is not set
+# CONFIG_INPUT_DB9 is not set
+# CONFIG_INPUT_GAMECON is not set
+# CONFIG_INPUT_TURBOGRAFX is not set
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -1051,34 +1004,14 @@ CONFIG_SOUND_COLLIE_TC35143=y
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 # CONFIG_USB_DEVICEFS is not set
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_LONG_TIMEOUT is not set
-
-#
-# USB Controllers
-#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
 # CONFIG_USB_OHCI_SA1111 is not set
-
-#
-# USB Device Class drivers
-#
 # CONFIG_USB_AUDIO is not set
-
-#
-#   USB Bluetooth can only be used with disabled Bluetooth subsystem
-#
-
-#
-#   SCSI support is needed for USB Storage
-#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -1090,44 +1023,21 @@ CONFIG_USB=m
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
-
-#
-# USB Human Interface Devices (HID)
-#
-
-#
-#   Input core support is needed for USB HID
-#
-
-#
-# USB Imaging devices
-#
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_WACOM is not set
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
-
-#
-# USB Multimedia devices
-#
-
-#
-#   Video4Linux support is needed for USB Multimedia device support
-#
-
-#
-# USB Network adaptors
-#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
-
-#
-# USB port drivers
-#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -1160,10 +1070,6 @@ CONFIG_USB=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
-
-#
-# USB Miscellaneous drivers
-#
 # CONFIG_USB_RIO500 is not set
 
 #
@@ -1178,17 +1084,9 @@ CONFIG_USBD_USE_SERIAL_NUMBER=y
 CONFIG_USBD_SERIAL_NUMBER_STR="A01234"
 CONFIG_USBD_SELFPOWERED=y
 CONFIG_USBD_MONITOR=m
-
-#
-# 
-#
 CONFIG_USBD_PROCFS=y
 
 #
-# USB Device functions
-#
-
-#
 # Network Function
 #
 CONFIG_USBD_NET=m
@@ -1223,10 +1121,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE=64
 # CONFIG_USBD_SERIAL_SAFE is not set
 
 #
-# USB Device bus interfaces
-#
-
-#
 # USB Device Bus Interface Support
 #
 CONFIG_USBD_SA1100_BUS=m
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index 63df6a88cf..62e9d31858 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -6,7 +6,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20030509"
-PR = "r21"
+PR = "r22"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
 SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb
index bb5a68d01e..8530111b0f 100644
--- a/packages/meta/openslug-native.bb
+++ b/packages/meta/openslug-native.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Packages that are required for the OpenSlug native build environment"
 LICENSE = MIT
-PR = "r7"
+PR = "r9"
 
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = 1
@@ -29,6 +29,7 @@ OPENSLUG_NATIVE = "\
 	libreadline4 libreadline-dev \
 	libstdc++-dev \
 	libthread-db1 \
+	libtool \
 	lrzsz \
 	m4 \
 	make \
@@ -36,7 +37,9 @@ OPENSLUG_NATIVE = "\
 	ncurses ncurses-dev ncurses-terminfo \
 	patch \
 	perl perl-modules \
-	python-core python-io python-lang python-pickle python-shell python-textutils \
+	pkgconfig \
+	python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \
+	quilt \
 	sed \
 	tar \
 	util-linux \
diff --git a/packages/iperf/.mtn2git_empty b/packages/nonworking/iperf/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/iperf/.mtn2git_empty
+++ b/packages/nonworking/iperf/.mtn2git_empty
diff --git a/packages/iperf/iperf-1.7.0/.mtn2git_empty b/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/iperf/iperf-1.7.0/.mtn2git_empty
+++ b/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
diff --git a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
index 15b1bc2928..15b1bc2928 100644
--- a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
+++ b/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/nonworking/iperf/iperf_1.7.0.bb
index ef075e8c8a..ef075e8c8a 100644
--- a/packages/iperf/iperf_1.7.0.bb
+++ b/packages/nonworking/iperf/iperf_1.7.0.bb
diff --git a/packages/perl/perl-5.8.7/config.sh-i386-linux b/packages/perl/perl-5.8.7/config.sh-i386-linux
index fda13d0d9b..3996011a2b 100644
--- a/packages/perl/perl-5.8.7/config.sh-i386-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i386-linux
@@ -435,6 +435,8 @@ d_strerrm='strerror(e)'
 d_strerror='define'
 d_strerror_r='undef'
 d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
 d_strtod='define'
 d_strtol='define'
 d_strtold='define'
diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux
index 313ff2fbb1..0ea1826f3a 100644
--- a/packages/perl/perl-5.8.7/config.sh-i686-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i686-linux
@@ -435,6 +435,8 @@ d_strerrm='strerror(e)'
 d_strerror='define'
 d_strerror_r='undef'
 d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
 d_strtod='define'
 d_strtol='define'
 d_strtold='define'
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 3500ca57bd..630c126bc2 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -5,7 +5,7 @@ include perl.inc
 SRC_URI += "file://config.sh-armeb-linux \
 	    file://config.sh-i386-linux"
 
-PR = "r10"
+PR = "r11"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
diff --git a/packages/qt/qt-x11-free_3.3.3.bb b/packages/qt/qt-x11-free_3.3.3.bb
index 8304de1461..1aaef72d1c 100644
--- a/packages/qt/qt-x11-free_3.3.3.bb
+++ b/packages/qt/qt-x11-free_3.3.3.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL QPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql"
-PR = "r6"
+PR = "r8"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
@@ -24,6 +24,7 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no
 EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
              QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+             AR="${TARGET_PREFIX}ar cqs" \
              MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"'
 
 do_configure() {
@@ -35,6 +36,8 @@ do_configure() {
 	find . -name "Makefile"|xargs rm -f
 	(cd src && qmake -spec ${QMAKESPEC} )
 	(cd plugins/src && qmake -spec ${QMAKESPEC} )
+	(cd tools && qmake -spec ${QMAKESPEC} )
+	(cd tools/qvfb && qmake -spec ${QMAKESPEC} )
 }
 
 do_compile() {
@@ -42,6 +45,8 @@ do_compile() {
 	unset CXXFLAGS
 	oe_runmake -C src ${EXTRA_ENV}
 	oe_runmake -C plugins/src ${EXTRA_ENV}
+	oe_runmake -C tools ${EXTRA_ENV}
+	oe_runmake -C tools/qvfb ${EXTRA_ENV}
 }
 
 do_stage() {
@@ -56,14 +61,27 @@ do_stage() {
 	do
 		install -m 0644 $f ${STAGING_QT_DIR}/include/private
 	done
+	for f in lib/*.prl
+	do
+		install -m 0644 $f ${STAGING_QT_DIR}/lib
+	done
 }
 
 do_install() {
 	install -d ${D}${libdir}/
 	oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
-	oe_runmake -C plugins/src INSTALL_ROOT="${D}" ${EXTRA_ENV} install
+	install -d ${D}${bindir}/
+	install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir}
+	install -d ${D}${prefix}/plugins/
+	cp -a plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
 }
 
-PACKAGES += "qt-x11-plugins"
-FILES_qt-x11-plugins = "${prefix}/plugins"
-
+PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
+             qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
+FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats"
+FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers"
+FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer"
+FILES_qt-x11-designer = "${bindir}/designer"
+FILES_qt-x11-assistant = "${bindir}/assistant"
+FILES_qt-x11-qvfb = "${bindir}/qvfb"
+FILES_qt-x11-qtconfig = "${bindir}/qtconfig"