propagate from branch 'org.openembedded.dev' (head 93d082d6c4a3db13947817853eef91fb326fc223)

            to branch 'org.openembedded.nslu2-linux' (head 3d6cac6f54eff620f4ea72c01aace1b87353dca8)

12 files changed, 70 insertions, 32 deletions

diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 122f2de435..c5e42a2bed 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-KERNEL_VERSION ?= "2.4"
+KERNEL_VERSION ?= "2.6"
 
 include conf/machine/zaurus-clamshell.conf
 include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index a922d5b4da..7a39104c63 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -6,7 +6,6 @@ IPKG_ARCHS = "all arm armv4 armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
-#PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo"
 
 XSERVER = "xserver-kdrive-omap"
 
@@ -26,17 +25,18 @@ ROOT_FLASH_SIZE = "123"
 EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers"
 
 # serial console port on devboard rev. B3
-SERIAL_CONSOLE = "115200 tts/0"
+#SERIAL_CONSOLE = "115200 tts/0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 
 #build omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev 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 = "udev sysfsutils  nokia770-init \
-pcmcia-cs apm  ppp wireless-tools udev-utils console-tools"
+BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils  nokia770-init \
+pcmcia-cs apm  ppp wireless-tools console-tools"
 
 # NFS Modules
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
index fc519ecfbc..b8f64bed78 100644
--- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r4"
+PR = "r6"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
diff --git a/packages/mozilla/minimo/host_ldflags_fix.patch b/packages/mozilla/minimo/host_ldflags_fix.patch
index 06028c9bf9..f4ff51fae1 100644
--- a/packages/mozilla/minimo/host_ldflags_fix.patch
+++ b/packages/mozilla/minimo/host_ldflags_fix.patch
@@ -1,9 +1,4 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mozilla/nsprpub/config/rules.mk~host_ldflags_fix.patch
+--- mozilla/nsprpub/config/rules.mk.old
 +++ mozilla/nsprpub/config/rules.mk
 @@ -87,6 +87,9 @@
  CCC=$(HOST_CXX)
@@ -15,12 +10,12 @@
  endif
  endif
  endif
---- mozilla/configure.in~host_ldflags_fix.patch
+--- mozilla/configure.in.old
 +++ mozilla/configure.in
-@@ -5496,12 +5496,17 @@
+@@ -6098,12 +6098,17 @@
  
  if test -n "$CROSS_COMPILE"; then
-     if test -z "$HOST_LIBIDL_CONFIG"; then
+      if test -z "$HOST_LIBIDL_CONFIG"; then
 +        AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
      fi
@@ -35,12 +30,12 @@
          HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
          HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
      fi
---- mozilla/configure~host_ldflags_fix.patch
+--- mozilla/configure.old
 +++ mozilla/configure
-@@ -16289,11 +16289,18 @@
+@@ -17604,11 +17604,18 @@
  
  if test -n "$CROSS_COMPILE"; then
-     if test -z "$HOST_LIBIDL_CONFIG"; then
+      if test -z "$HOST_LIBIDL_CONFIG"; then
 +        echo "HOST_LIBIDL_CONFIG nto defined"
          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
      fi
diff --git a/packages/sylpheed/files/sylpheed-gnutls-extra.patch b/packages/sylpheed/files/sylpheed-gnutls-extra.patch
new file mode 100644
index 0000000000..ba24b5a1d7
--- /dev/null
+++ b/packages/sylpheed/files/sylpheed-gnutls-extra.patch
@@ -0,0 +1,37 @@
+--- sylpheed-2.0.0beta6/src/ssl.c.orig	2005-07-20 15:45:12.882201824 +0100
++++ sylpheed-2.0.0beta6/src/ssl.c	2005-07-20 16:10:04.006516472 +0100
+@@ -54,9 +54,9 @@
+ 		debug_print(_("SSLv23 not available\n"));
+ 	} else {
+ 		debug_print(_("SSLv23 available\n"));
+-		if (certs_dir &&
++		if (certs_dir /*&&
+ 		    !SSL_CTX_load_verify_locations(ssl_ctx_SSLv23, NULL,
+-						   certs_dir))
++						   certs_dir)*/)
+ 			g_warning("SSLv23 SSL_CTX_load_verify_locations failed.\n");
+ 	}
+ 
+@@ -65,9 +65,9 @@
+ 		debug_print(_("TLSv1 not available\n"));
+ 	} else {
+ 		debug_print(_("TLSv1 available\n"));
+-		if (certs_dir &&
++		if (certs_dir /*&&
+ 		    !SSL_CTX_load_verify_locations(ssl_ctx_TLSv1, NULL,
+-						   certs_dir))
++						   certs_dir)*/)
+ 			g_warning("TLSv1 SSL_CTX_load_verify_locations failed.\n");
+ 	}
+ 
+@@ -151,8 +151,8 @@
+ 			g_free(str);
+ 		}
+ 
+-		verify_result = SSL_get_verify_result(sockinfo->ssl);
+-		if (verify_result == X509_V_OK)
++		verify_result = 0; /*SSL_get_verify_result(sockinfo->ssl);*/
++		if (verify_result == 1)
+ 			debug_print("SSL verify OK\n");
+ 		else
+ 			g_warning("%s: SSL certificate verify failed (%ld: %s)\n",
diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb
index 4fab8e8bb8..d95f21f343 100644
--- a/packages/sylpheed/sylpheed_2.0.0beta6.bb
+++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb
@@ -1,12 +1,13 @@
 SECTION = "x11/network"
 DESCRIPTION = "Mail user agent"
 DEPENDS = "gtk+ gpgme gnutls"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \
-	file://sylpheed-gnutls_2.0.0beta6.patch;patch=1"
+	file://sylpheed-gnutls_2.0.0beta6.patch;patch=1 \
+	file://sylpheed-gnutls-extra.patch;patch=1 "
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN}-doc += "${datadir}"
diff --git a/packages/tslib/tslib-maemo/nokia770/ts.conf b/packages/tslib/tslib-maemo/nokia770/ts.conf
index 24b00839e9..8eed62f7b9 100644
--- a/packages/tslib/tslib-maemo/nokia770/ts.conf
+++ b/packages/tslib/tslib-maemo/nokia770/ts.conf
@@ -1,2 +1,2 @@
 module pressure
-module linear
\ No newline at end of file
+module linear
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index 28a5f00fa9..6bc844e8dd 100644
--- a/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -1,7 +1,8 @@
+DEFAULT_PREFERENCE = "-1"
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)."
 PR = "r1"
-PROVIDES = "virtual/tslib"
+PROVIDES = "tslib"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -37,6 +38,12 @@ do_install_append() {
 
 RDEPENDS_libts-maemo = "tslib-maemo-conf"
 
+RPROVIDES_tslib-maemo-conf = "tslib-conf"
+RPROVIDES_libts-maemo = "libts"
+RPROVIDES_libts-maemo-dev = "libts-dev"
+RPROVIDES_tslib-maemo-calibrate = "tslib-calibrate"
+RPROVIDES_tslib-maemo-tests = "tslib-tests"
+
 FILES_tslib-maemo-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
 FILES_libts-maemo = "${libdir}/*.so.* ${datadir}/ts/plugins/*.so*"
 FILES_libts-maemo-dev = "${FILES_tslib-maemo-dev}"
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 00abd36ba2..0b51df4797 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -12,6 +12,7 @@ inherit update-rc.d
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 04 S ."
 
+export CROSS = "${TARGET_PREFIX}"
 export HOSTCC = "${BUILD_CC}"
 export udevdir ?= "/dev"
 export usrbindir := "${bindir}"
@@ -21,7 +22,7 @@ LD = "${CC}"
 bindir = "/bin"
 sbindir = "/sbin"
 
-UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/"
+UDEV_EXTRAS = "<override me>"
 FILES_${PN} += "${usrbindir} ${usrsbindir}"
 EXTRA_OEMAKE = "-e \
 		'EXTRAS=${UDEV_EXTRAS}' \
@@ -39,4 +40,3 @@ do_install () {
 	install -d ${D}${sysconfdir}/udev/rules.d/
 	install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/
 }
-
diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb
index 539e7aedb8..bab87e6cb2 100644
--- a/packages/udev/udev_058.bb
+++ b/packages/udev/udev_058.bb
@@ -7,4 +7,4 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 include udev.inc
 
 PR = "r3"
-# CFLAGS += -I${STAGING_INCDIR}/sysfs
+UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/"
diff --git a/packages/udev/udev_063.bb b/packages/udev/udev_063.bb
index 083a6bf88a..83e237ed8e 100644
--- a/packages/udev/udev_063.bb
+++ b/packages/udev/udev_063.bb
@@ -7,7 +7,8 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r1"
+PR = "r2"
+UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
 #FIXME UDEV MIGRATION PLAN:
 #FIXME      a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old)
@@ -15,8 +16,6 @@ PR = "r1"
 #FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append()
 #FIXME      d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules
 
-EXTRA_OEMAKE = "EXTRAS=extras/run_directory/"
-
 do_install_append() {
 	install -m 0755 extras/run_directory/udev_run_hotplugd ${D}${sbindir}/
 	echo RUN+="/sbin/udev_run_hotplugd" >>${D}${sysconfdir}/udev/rules.d/50-udev.rules
diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xserver/xserver-kdrive-omap_6.6.3.bb
index e4eed066dd..5b131de8bd 100644
--- a/packages/xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/packages/xserver/xserver-kdrive-omap_6.6.3.bb
@@ -1,13 +1,12 @@
 LICENSE = "MIT"
 DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
-RDEPENDS = "libts-0.0-0"
 PROVIDES = "virtual/xserver"
 PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices"
 
-PR = "r1"
+PR = "r2"
 
 FILES_${PN} = "${bindir}/Xomap"