merge of '486564afb93dc07dd531c82b2f7735424a813a69'

     and '894eccb0f6fd46f8c72a9457612feba217d953b6'

19 files changed, 157 insertions, 20 deletions

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index e89d2185a7..2e8688b263 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -61,7 +61,9 @@ PREFERRED_VERSION_binutils-cross    = "2.18"
 
 PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
 PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+
+#PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
 
 # Use recent enough version of the headers to let HAL build successfully.
 PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -165,7 +167,7 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
 PREFERRED_PROVIDER_virtual/javac-native	  = "ecj-bootstrap-native"
 
 PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97"
+PREFERRED_VERSION_classpath = "0.97.1"
 
 PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
 PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
@@ -200,3 +202,5 @@ PKG_bluez-libs = "libbluetooth2"
 
 PKG_osso-ic-oss = "osso-ic"
 PKG_libconic = "libconic0"
+
+PKG_libgcc = "libgcc1"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index df0a21a3e4..1957500a02 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080330"
+EFL_SRCDATE = "20080409"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 9f478f7963..0e5aa1ccb5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -142,12 +142,14 @@ SRCREV_pn-opkg-native ?= "4235"
 SRCREV_pn-opkg-sdk ?= "4235"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
+SRCREV_pn-py-odeviced = "161"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "88"
 SRCREV_pn-pyneog ?= "88"
 SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-python-pyrtc = "152"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index 69788f66af..8f1ee88937 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -318,7 +318,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core python-stringold python-lang",
     "unittest.*" )
 
-    m.addPackage( 0, "python-xml", "Python basic XML support.", "python-core python-re python-netclient",
+    m.addPackage( 1, "python-xml", "Python basic XML support.", "python-core python-re",
     "lib-dynload/pyexpat.so xml xmllib.*" ) # package
 
     m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core python-xml python-netserver python-lang",
diff --git a/packages/freesmartphone/py-odeviced_svn.bb b/packages/freesmartphone/py-odeviced_svn.bb
new file mode 100644
index 0000000000..cc4f18cdf6
--- /dev/null
+++ b/packages/freesmartphone/py-odeviced_svn.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "The Open Device Daemon Prototype in Python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python"
+LICENSE = "GPLv2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit distutils
+
+#inherit update-rc.d
+#INITSCRIPT_NAME = "py-odeviced"
+#INITSCRIPT_PARAMS = "defaults 20"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced"
+S = "${WORKDIR}/py-odeviced"
+
+RDEPENDS_${PN} += "\
+  python-dbus \
+  python-pygobject \
+"
diff --git a/packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch b/packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch
new file mode 100644
index 0000000000..36c9d15908
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch
@@ -0,0 +1,76 @@
+Source: http://bugzilla.gnome.org/show_bug.cgi?id=522335
+
+This patch fixes the following error.
+
+| make[4]: Entering directory `/home/khem/oe/build/eglibc/tmp-qemuarm/work/armv5te-angstrom-linux-gnueabi/glib-2.0-2.16.1-r3/glib-2.16.1/glib'
+| if ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I..  -I..  -DG_LOG_DOMAIN=\"GLib\" -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DPCRE_STATIC -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -pthread  -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -Wall -MT gtester.o -MD -MP -MF ".deps/gtester.Tpo" -c -o gtester.o gtester.c; \
+| 	then mv -f ".deps/gtester.Tpo" ".deps/gtester.Po"; else rm -f ".deps/gtester.Tpo"; exit 1; fi
+| gtester.c: In function 'launch_test_binary':
+| gtester.c:276: error: 'ARG_MAX' undeclared (first use in this function)
+| gtester.c:276: error: (Each undeclared identifier is reported only once
+| gtester.c:276: error: for each function it appears in.)
+| gtester.c:276: warning: unused variable 'argv'
+| make[4]: *** [gtester.o] Error 1
+
+
+Index: glib-2.16.1/glib/gtester.c
+===================================================================
+--- glib-2.16.1.orig/glib/gtester.c	(Revision 6750)
++++ glib-2.16.1/glib/gtester.c	(Arbeitskopie)
+@@ -273,7 +273,8 @@
+   GTestLogBuffer *tlb;
+   GSList *slist, *free_list = NULL;
+   GError *error = NULL;
+-  const gchar *argv[ARG_MAX];
++  int argc = 0;
++  const gchar **argv;
+   GPid pid = 0;
+   gint report_pipe[2] = { -1, -1 };
+   guint child_report_cb_id = 0;
+@@ -289,7 +290,34 @@
+       return FALSE;
+     }
+ 
++  /* setup argc */
++  for (slist = subtest_args; slist; slist = slist->next)
++    argc++;
++  /* argc++; */
++  if (subtest_quiet)
++    argc++;
++  if (subtest_verbose)
++    argc++;
++  if (!subtest_mode_fatal)
++    argc++;
++  if (subtest_mode_quick)
++    argc++;
++  else
++    argc++;
++  if (subtest_mode_perf)
++    argc++;
++  if (gtester_list_tests)
++    argc++;
++  if (subtest_seedstr)
++    argc++;
++  argc++;
++  if (skip_tests)
++    argc++;
++  for (slist = subtest_paths; slist; slist = slist->next)
++    argc++;
++
+   /* setup argv */
++  argv = g_malloc ((argc + 1) * sizeof(gchar *));
+   argv[i++] = binary;
+   for (slist = subtest_args; slist; slist = slist->next)
+     argv[i++] = (gchar*) slist->data;
+@@ -343,8 +371,10 @@
+       else
+         g_warning ("Failed to execute test binary: %s: %s", argv[0], error->message);
+       g_clear_error (&error);
++      g_free (argv);
+       return FALSE;
+     }
++  g_free (argv);
+ 
+   subtest_running = TRUE;
+   subtest_io_pending = TRUE;
+
diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb
index ccbbb9be70..ef7a1e84fc 100644
--- a/packages/glib-2.0/glib-2.0_2.16.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.1.bb
@@ -1,9 +1,10 @@
 require glib.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \
            file://gcc-4.2-inline-fix.patch;patch=1 \
+           file://hurd-arg-max.patch;patch=1 \
           "
diff --git a/packages/jamvm/jamvm_1.5.1.bb b/packages/jamvm/jamvm_1.5.1.bb
new file mode 100644
index 0000000000..bf9271c938
--- /dev/null
+++ b/packages/jamvm/jamvm_1.5.1.bb
@@ -0,0 +1,12 @@
+require jamvm.inc
+
+SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
+
+PR = "r0"
+
+do_configure_prepend() {
+  # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+  # configured in OE.
+  sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/dll.c
+}
+
diff --git a/packages/jikes/files/dummy b/packages/jikes/files/dummy
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/jikes/files/dummy
diff --git a/packages/jikes/jikes-initial.bb b/packages/jikes/jikes-initial.bb
index 0e2f4d0748..1bd4fbfe69 100644
--- a/packages/jikes/jikes-initial.bb
+++ b/packages/jikes/jikes-initial.bb
@@ -2,7 +2,8 @@ SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler"
 
 DEPENDS = "jikes-native classpath-initial"
 
-SRC_URI = ""
+# Packaged-staging needs a Source: field to put in the packages, so SRC_URI can't be empty
+SRC_URI = "file://dummy"
 
 S = "${WORKDIR}"
 
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index c098494d17..fda9f4143a 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Fri Mar 21 18:43:05 2008
+### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Apr 10 16:47:00 2008
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -208,8 +208,8 @@ RDEPENDS_python-mailbox="python-core python-mime"
 FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml0"
-RDEPENDS_python-xml="python-core python-re python-netclient"
+PR_python-xml="ml1"
+RDEPENDS_python-xml="python-core python-re"
 FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb
index 08cdbf7f44..6940adf223 100644
--- a/packages/python/python-dbus_0.82.4.bb
+++ b/packages/python/python-dbus_0.82.4.bb
@@ -3,8 +3,8 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
-RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml3"
+RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
+PR = "ml4"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb
index cc0f3cfcd9..e730f0f8ba 100644
--- a/packages/python/python-pydirectfb_cvs.bb
+++ b/packages/python/python-pydirectfb_cvs.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "DirectFB Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "directfb"
 SRCNAME = "pydirectfb"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "ml0"
diff --git a/packages/python/python-pyrtc_svn.bb b/packages/python/python-pyrtc_svn.bb
new file mode 100644
index 0000000000..60277a029d
--- /dev/null
+++ b/packages/python/python-pyrtc_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
+RTC (Real Time Clock) found in most PCs and SOCs"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+LICENSE = "GPLv2"
+SRCNAME = "pyrtc"
+DEPENDS = "python-cython-native"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
diff --git a/packages/python/python-pyserial_2.2.bb b/packages/python/python-pyserial_2.2.bb
index a5d083c580..57d184fcc3 100644
--- a/packages/python/python-pyserial_2.2.bb
+++ b/packages/python/python-pyserial_2.2.bb
@@ -3,12 +3,13 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
 SRCNAME = "pyserial"
-RDEPENDS = "python-fcntl python-io"
-
-PR = "r1"
+RDEPENDS = "python-fcntl python-io python-stringold"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.zip"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
+# FIXME might stop packaging serialwin32 and serialjava files
+
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index af907f23c9..325e541b97 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -5,7 +5,8 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml1"
+# bump this on every change in contrib/python/generate-manifest-2.5.py
+PR = "ml2"
 
 PYTHON_MAJMIN = "2.5"
 
diff --git a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
index c7b89647f5..671606c201 100644
--- a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
+++ b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "libusb-native"
 SECTION = "devel"
 AUTHOR = "Harald Welte"
 LICENSE = "GPL"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCREV}"
 PR = "r0"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
diff --git a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
index 085339a9c1..516fbb0c3a 100644
--- a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
+++ b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
 SECTION = "console/utils"
 LICENSE = "GPL"
-PV = "1.0+svn${SRCDATE}"
-PR = "r0"
+PV = "1.0+svn${SRCREV}"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
 S = "${WORKDIR}/gpio"
diff --git a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
index 60cce4a3e2..bead6039f8 100644
--- a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
+++ b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
 SECTION = "devel"
 AUTHOR = "Harald Welte"
 LICENSE = "GPL"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1+svn${SRCREV}"
 PR = "r0"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"