15 files changed, 110 insertions, 109 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 840ebf6eff..97cf036dd9 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -464,7 +464,6 @@ python do_qa_configure() {
                     os.path.join(root,"config.log")
         if "config.log" in files:
             if os.system(statement) == 0:
-                bb.fatal("This autoconf log indicates errors, it looked at \
-                          host includes. Rerun configure task after fixing this. \
-                          Path was '%s'" % root)
+                bb.fatal("""This autoconf log indicates errors, it looked at host includes.
+Rerun configure task after fixing this. The path was '%s'""" % root)
 }
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c91bdcfc92..b9e6f6e6aa 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
@@ -13,13 +14,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
 IMAGE_LINGUAS = ""
-
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-require conf/machine/include/tune-strongarm.inc
-
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index c037226154..6f0e37b803 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 # h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 34255a1536..515700d9e6 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
deleted file mode 100644
index 8654c996ef..0000000000
--- a/conf/machine/include/tune-strongarm.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-
diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc
new file mode 100644
index 0000000000..f136710409
--- /dev/null
+++ b/conf/machine/include/tune-strongarm1100.inc
@@ -0,0 +1,5 @@
+# This machine lists common configuration options for Strongarm 1100 devices
+# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
+
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
+
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index 72fff1ed5e..a42dd8c127 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 8741eb4ff6..ee9117e406 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index d7d35cfda1..87c260856d 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 6334d34171..e187ee1e75 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
 
 include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 
 ROOT_FLASH_SIZE = "16"
diff --git a/packages/dtnrg/.mtn2git_empty b/packages/dtnrg/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dtnrg/.mtn2git_empty
diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb
new file mode 100644
index 0000000000..0b4043bbc2
--- /dev/null
+++ b/packages/dtnrg/dtn_2.5.0.bb
@@ -0,0 +1,60 @@
+DESCRIPTION = "Delay Tolerant Networking Package"
+HOMEPAGE = "http://www.dtnrg.org/wiki"
+SECTION = "libs"
+DEPENDS = "db openssl python-native xerces-c"
+LICENSE = "Apache"
+SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+  --with-python=${STAGING_BINDIR_NATIVE}/python \
+  --with-db=${STAGING_DIR} \
+  --with-tcl=${STAGING_DIR} \
+  --without-google-perftools \
+  --without-bluez \
+  --without-bonjour \
+  --with-expat=${STAGING_DIR} \
+  --with-xerces-c=${STAGING_DIR} \
+  --without-tclreadline \
+  --with-zlib=${STAGING_DIR} \
+  --without-xsd-tool \
+  --with-db=${STAGING_DIR} \
+  --enable-ecl \
+  --enable-edp \
+  --without-mysql \
+  --without-postgres \
+  --with-openssl=${STAGING_DIR} \
+"
+
+def python_dir(d):
+        import os, bb
+        staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
+        if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
+        if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
+        if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
+        raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
+
+PYTHON_DIR = "${@python_dir(d)}"
+
+export BUILD_SYS
+export HOST_SYS
+
+do_configure_prepend() {
+	for i in aclocal/*.ac oasys/aclocal/*.ac; do
+		install -m 0644 $i ${STAGING_DATADIR}/aclocal/`basename $i`.m4
+	done
+	autotools_do_configure
+}
+
+do_install_append() {
+	cd applib/python
+	INCDIR=../.. LIBDIR=.. VERSION=${PV} python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir}
+}
+
+PACKAGES += "python-dtn"
+DESCRIPTION_python-dtn = "Python bindings to the DTN API"
+PR_python-dtn = "ml1"
+FILES_python-dtn = "${libdir}/${PYTHON_DIR}"
+RDEPENDS_python-dtn = "python-core"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb
deleted file mode 100644
index fe0677f54f..0000000000
--- a/packages/xerces-c/xerces-c_2.6.0.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Xerces-c xml"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-
-S = "${WORKDIR}/xerces-c-src_2_6_0"
-
-SRC_URI = "http://www.axint.net/apache/xml/xerces-c/xerces-c-src_2_6_0.tar.gz"
-
-inherit pkgconfig
-
-
-#
-# Warning: BITSTOBUILD will default to 32 bits
-#
-export TRANSCODER="NATIVE"
-export MESSAGELOADER="INMEM"
-export NETACCESSOR="Socket"
-export THREADS="pthread"
-export BITSTOBUILD="32"
-export LIBS = " -lpthread "
-CFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-CXXFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-
-do_configure() {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    ./configure
-}
-
-do_compile () {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    oe_runmake
-}
-
-do_stage () {
-    oe_libinstall -C lib libxerces-c ${STAGING_LIBDIR}
-    oe_libinstall -C lib libxerces-depdom ${STAGING_LIBDIR}
-
-    cp -pPR include/xercesc ${STAGING_INCDIR}
-}
-
-do_install () {
-    oe_libinstall -C lib libxerces-c ${D}${libdir}
-    oe_libinstall -C lib libxerces-depdom ${D}${libdir}
-}
diff --git a/packages/xerces-c/xerces-c_2.7.0.bb b/packages/xerces-c/xerces-c_2.7.0.bb
deleted file mode 100644
index 8fdab80180..0000000000
--- a/packages/xerces-c/xerces-c_2.7.0.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Xerces-c xml"
-SECTION =  "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-
-S = "${WORKDIR}/xerces-c-src_2_7_0"
-
-SRC_URI = "http://www.axint.net/apache/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz"
-
-inherit pkgconfig
-
-
-#
-# Warning: BITSTOBUILD will default to 32 bits
-#
-export TRANSCODER="NATIVE"
-export MESSAGELOADER="INMEM"
-export NETACCESSOR="Socket"
-export THREADS="pthread"
-export BITSTOBUILD="32"
-export LIBS = " -lpthread "
-CFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-CXXFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-
-do_configure() {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    ./configure
-}
-
-do_compile () {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    oe_runmake
-}
-
-do_stage () {
-    oe_libinstall -C lib libxerces-c ${STAGING_LIBDIR}
-    oe_libinstall -C lib libxerces-depdom ${STAGING_LIBDIR}
-
-    cp -pPR include/xercesc ${STAGING_INCDIR}
-}
-
-do_install () {
-    oe_libinstall -C lib libxerces-c ${D}${libdir}
-    oe_libinstall -C lib libxerces-depdom ${D}${libdir}
-}
diff --git a/packages/xerces-c/xerces-c_2.8.0.bb b/packages/xerces-c/xerces-c_2.8.0.bb
new file mode 100644
index 0000000000..4f72e9dc77
--- /dev/null
+++ b/packages/xerces-c/xerces-c_2.8.0.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Xerces-c is a validating xml parser written in C++"
+HOMEPAGE = "http://xerces.apache.org/xerces-c/"
+SECTION =  "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+PR = "r1"
+
+SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz"
+S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc"
+
+inherit autotools pkgconfig
+
+CCACHE = ""
+export XERCESCROOT="${WORKDIR}/xerces-c-src_2_8_0"
+export cross_compiling = "yes"
+
+do_configure() {
+	./runConfigure -plinux -c"${CC}" -x"${CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix} \
+                    -C--build=${BUILD_SYS} \
+                    -C--host=${HOST_SYS} \
+                    -C--target=${TARGET_SYS} \
+}
+
+do_compile() {
+	${MAKE}
+}
+
+do_stage () {
+    oe_libinstall -C ${XERCESCROOT}/lib libxerces-c ${STAGING_LIBDIR}
+    oe_libinstall -C ${XERCESCROOT}/lib libxerces-depdom ${STAGING_LIBDIR}
+    cp -pPR ${XERCESCROOT}/include/xercesc ${STAGING_INCDIR}
+}
+
+do_install () {
+	${MAKE} install
+}