merge of 2653a4b40327fa4b9850b64660c0b840a53b9e4d

     and 7d7a212e875a69547a4ab175f18225661a30c5ce

98 files changed, 2491 insertions, 2472 deletions

diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 3c88b2ac63..168b7dec4e 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -1,5 +1,5 @@
 def tinder_tz_offset(off):
-    # get the offset. Either it is a number like
+    # get the offset.n minutes Either it is a number like
     # +200 or -300
     try:
         return int(off)
@@ -42,9 +42,16 @@ 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-packages.conf b/conf/distro/openslug-packages.conf
index 6457d89226..8719894e6a 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -15,7 +15,9 @@ ${PKGDIR}/packages/bluez-utils/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/ccxstream/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index b76d352b8a..c6575241ba 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -14,7 +14,9 @@ ${PKGDIR}/packages/bluez-utils/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/ccxstream/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
@@ -129,6 +131,7 @@ ${PKGDIR}/packages/sudo/*.bb \
 ${PKGDIR}/packages/sysfsutils/*.bb \
 ${PKGDIR}/packages/sysvinit/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
+${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
 ${PKGDIR}/packages/uclibc/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 24a1e202f1..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,7 +1,9 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 567cee8ba1..fc61ba4f6a 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the IBM Netvista thin client
 
 TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i386 ${MACHINE}"
+IPKG_ARCHS = "all i386"
 PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace"
@@ -17,6 +17,8 @@ TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
 IMAGE_FSTYPE = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
 
 #BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
 #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 7a39104c63..c928093855 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -11,10 +11,8 @@ XSERVER = "xserver-kdrive-omap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-include conf/machine/handheld-common.conf
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/tune-arm926ejs.conf
@@ -32,10 +30,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
 #build omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils  nokia770-init \
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils  nokia770-init \
 pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils  nokia770-init \
+BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
 pcmcia-cs apm  ppp wireless-tools console-tools"
 
 # NFS Modules
@@ -56,3 +54,7 @@ pcmcia-cs apm  ppp wireless-tools console-tools"
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
 #							 kernel-module-g-ether"
 
+include conf/machine/handheld-common.conf
+
+
+
diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/bwmon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.4/.mtn2git_empty
+++ b/packages/bwmon/.mtn2git_empty
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb
new file mode 100644
index 0000000000..26c620e013
--- /dev/null
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "The Linux bandwidth monitor"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+DEPENDS = "ncurses"
+
+LICENSE = "Unspecified"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
+	   file://makefile.patch;patch=1"
+EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
+
+inherit autotools
+
+do_install () {
+	install -d ${D}${bindir}
+	install ${S}/bwmon ${D}${bindir}/bwmon
+}
diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/bwmon/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.8/.mtn2git_empty
+++ b/packages/bwmon/files/.mtn2git_empty
diff --git a/packages/bwmon/files/makefile.patch b/packages/bwmon/files/makefile.patch
new file mode 100644
index 0000000000..b8e2b7abdc
--- /dev/null
+++ b/packages/bwmon/files/makefile.patch
@@ -0,0 +1,18 @@
+--- bwmon-1.3/src/Makefile	2002-05-03 12:11:52.000000000 +0200
++++ /home/repvik/Makefile	2005-08-02 04:17:43.021622816 +0200
+@@ -6,12 +6,12 @@
+ # I used to provide a version for non-curses
+ # but I do not anymore
+ 
+-CC = gcc
++#CC = gcc
+ RM = /bin/rm
+-INSTALL = install
++#INSTALL = install
+ 
+ CFLAGS = -I../include -Wall -D__THREADS
+-LDFLAGS = -lpthread -lncurses 
++LDFLAGS += -lpthread -lncurses
+ 
+ SRC = bwmon.c
+ OBJS = $(SRC:.c=.o)
diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb
index 751e0412c5..cc42d895ca 100644
--- a/packages/ccxstream/ccxstream_1.0.15.bb
+++ b/packages/ccxstream/ccxstream_1.0.15.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "XStream Server"
-
+DEPENDS = "readline"
 LICENSE = "GPL-2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \
 	file://ccxstream-termcap.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb
index 30e694f08e..dc3f6f2e72 100644
--- a/packages/dbus/dbus_0.23.4.bb
+++ b/packages/dbus/dbus_0.23.4.bb
@@ -1,5 +1,5 @@