merge of '1944e442d97092991784475bf4b8980e60c5c3fc'

     and 'c6043a6be9941ce6182b30748b51b8f191e04bc8'

35 files changed, 626 insertions, 365 deletions

diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
new file mode 100644
index 0000000000..9697426d5d
--- /dev/null
+++ b/classes/package_deb.bbclass
@@ -0,0 +1,238 @@
+inherit package
+DEPENDS_prepend="${@["dpkg-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
+BOOTSTRAP_EXTRA_RDEPENDS += "dpkg"
+DISTRO_EXTRA_RDEPENDS += "dpkg"
+PACKAGE_WRITE_FUNCS += "do_package_deb"
+IMAGE_PKGTYPE ?= "deb"
+
+python package_deb_fn () {
+    from bb import data
+    bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
+}
+
+addtask package_deb_install
+python do_package_deb_install () {
+    import os, sys
+    pkg = bb.data.getVar('PKG', d, 1)
+    pkgfn = bb.data.getVar('PKGFN', d, 1)
+    rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1)
+    debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1)
+    stagingdir = bb.data.getVar('STAGING_DIR', d, 1)
+    stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1)
+    tmpdir = bb.data.getVar('TMPDIR', d, 1)
+
+    if None in (pkg,pkgfn,rootfs):
+        raise bb.build.FuncFailed("missing variables (one or more of PKG, PKGFN, IMAGE_ROOTFS)")
+    try:
+        if not os.exists(rootfs):
+            os.makedirs(rootfs)
+        os.chdir(rootfs)
+    except OSError:
+        raise bb.build.FuncFailed(str(sys.exc_value))
+
+    # update packages file
+    (exitstatus, output) = commands.getstatusoutput('dpkg-scanpackages %s > %s/Packages' % (debdir, debdir))
+    if (exitstatus != 0 ):
+        raise bb.build.FuncFailed(output)
+
+    f = open(os.path.join(tmpdir, "stamps", "do_packages"), "w")
+    f.close()
+
+    # NOTE: this env stuff is racy at best, we need something more capable
+    # than 'commands' for command execution, which includes manipulating the
+    # env of the fork+execve'd processs
+
+    # Set up environment
+    apt_config = os.getenv('APT_CONFIG')
+    os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf'))
+    path = os.getenv('PATH')
+    os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH')))
+
+    # install package
+    commands.getstatusoutput('apt-get update')
+    commands.getstatusoutput('apt-get install -y %s' % pkgfn)
+
+    # revert environment
+    os.putenv('APT_CONFIG', apt_config)
+    os.putenv('PATH', path)
+}
+
+python do_package_deb () {
+    import copy # to back up env data
+    import sys
+    import re
+
+    workdir = bb.data.getVar('WORKDIR', d, 1)
+    if not workdir:
+        bb.error("WORKDIR not defined, unable to package")
+        return
+
+    import os # path manipulations
+    outdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1)
+    if not outdir:
+        bb.error("DEPLOY_DIR_DEB not defined, unable to package")
+        return
+
+    dvar = bb.data.getVar('D', d, 1)
+    if not dvar:
+        bb.error("D not defined, unable to package")
+        return
+    bb.mkdirhier(dvar)
+
+    packages = bb.data.getVar('PACKAGES', d, 1)
+    if not packages:
+        bb.debug(1, "PACKAGES not defined, nothing to package")
+        return
+
+    tmpdir = bb.data.getVar('TMPDIR', d, 1)
+    # Invalidate the packages file
+    if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK):
+        os.unlink(os.path.join(tmpdir, "stamps", "do_packages"))
+
+    if packages == []:
+        bb.debug(1, "No packages; nothing to do")
+        return
+
+    for pkg in packages.split():
+        localdata = bb.data.createCopy(d)
+        root = "%s/install/%s" % (workdir, pkg)
+
+        bb.data.setVar('ROOT', '', localdata)
+        bb.data.setVar('ROOT_%s' % pkg, root, localdata)
+        pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
+        if not pkgname:
+            pkgname = pkg
+        bb.data.setVar('PKG', pkgname, localdata)
+
+        overrides = bb.data.getVar('OVERRIDES', localdata)
+        if not overrides:
+            raise bb.build.FuncFailed('OVERRIDES not defined')
+        overrides = bb.data.expand(overrides, localdata)
+        bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
+
+        bb.data.update_data(localdata)
+        basedir = os.path.join(os.path.dirname(root))
+
+        pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1))
+        bb.mkdirhier(pkgoutdir)
+
+        os.chdir(root)
+        from glob import glob
+        g = glob('*')
+        try:
+            del g[g.index('DEBIAN')]
+            del g[g.index('./DEBIAN')]
+        except ValueError:
+            pass
+        if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
+            from bb import note
+            note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+            continue
+        controldir = os.path.join(root, 'DEBIAN')
+        bb.mkdirhier(controldir)
+        try:
+            ctrlfile = file(os.path.join(controldir, 'control'), 'wb')
+            # import codecs
+            # ctrlfile = codecs.open("someFile", "w", "utf-8")
+        except OSError:
+            raise bb.build.FuncFailed("unable to open control file for writing.")
+
+        fields = []
+        fields.append(["Version: %s-%s\n", ['PV', 'PR']])
+        fields.append(["Description: %s\n", ['DESCRIPTION']])
+        fields.append(["Section: %s\n", ['SECTION']])
+        fields.append(["Priority: %s\n", ['PRIORITY']])
+        fields.append(["Maintainer: %s\n", ['MAINTAINER']])
+        fields.append(["Architecture: %s\n", ['TARGET_ARCH']])
+        fields.append(["OE: %s\n", ['P']])
+        fields.append(["Homepage: %s\n", ['HOMEPAGE']])
+
+#        Package, Version, Maintainer, Description - mandatory
+#        Section, Priority, Essential, Architecture, Source, Depends, Pre-Depends, Recommends, Suggests, Conflicts, Replaces, Provides - Optional
+
+
+        def pullData(l, d):
+            l2 = []
+            for i in l:
+                data = bb.data.getVar(i, d, 1)
+                if data is None:
+                    raise KeyError(f)
+		if i == 'TARGET_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all':
+                    data = 'all'
+                l2.append(data)
+            return l2
+
+        ctrlfile.write("Package: %s\n" % pkgname)
+        # check for required fields
+        try:
+            for (c, fs) in fields:
+                ctrlfile.write(unicode(c % tuple(pullData(fs, localdata))))
+        except KeyError:
+            (type, value, traceback) = sys.exc_info()
+            ctrlfile.close()
+            raise bb.build.FuncFailed("Missing field for deb generation: %s" % value)
+        # more fields
+
+        bb.build.exec_func("mapping_rename_hook", localdata)
+
+        rdepends = explode_deps(unicode(bb.data.getVar("RDEPENDS", localdata, 1) or ""))
+        rdepends = [dep for dep in rdepends if not '*' in dep]
+        rrecommends = explode_deps(unicode(bb.data.getVar("RRECOMMENDS", localdata, 1) or ""))
+        rrecommends = [rec for rec in rrecommends if not '*' in rec]
+        rsuggests = (unicode(bb.data.getVar("RSUGGESTS", localdata, 1) or "")).split()
+        rprovides = (unicode(bb.data.getVar("RPROVIDES", localdata, 1) or "")).split()
+        rreplaces = (unicode(bb.data.getVar("RREPLACES", localdata, 1) or "")).split()
+        rconflicts = (unicode(bb.data.getVar("RCONFLICTS", localdata, 1) or "")).split()
+        if rdepends:
+            ctrlfile.write(u"Depends: %s\n" % ", ".join(rdepends))
+        if rsuggests:
+            ctrlfile.write(u"Suggests: %s\n" % ", ".join(rsuggests))
+        if rrecommends:
+            ctrlfile.write(u"Recommends: %s\n" % ", ".join(rrecommends))
+        if rprovides:
+            ctrlfile.write(u"Provides: %s\n" % ", ".join(rprovides))
+        if rreplaces:
+            ctrlfile.write(u"Replaces: %s\n" % ", ".join(rreplaces))
+        if rconflicts:
+            ctrlfile.write(u"Conflicts: %s\n" % ", ".join(rconflicts))
+        ctrlfile.close()
+
+        for script in ["preinst", "postinst", "prerm", "postrm"]:
+            scriptvar = bb.data.getVar('pkg_%s' % script, localdata, 1)
+            if not scriptvar:
+                continue
+            try:
+                scriptfile = file(os.path.join(controldir, script), 'w')
+            except OSError:
+                raise bb.build.FuncFailed("unable to open %s script file for writing." % script)
+            scriptfile.write(scriptvar)
+            scriptfile.close()
+            os.chmod(os.path.join(controldir, script), 0755)
+
+        conffiles_str = bb.data.getVar("CONFFILES", localdata, 1)
+        if conffiles_str:
+            try:
+                conffiles = file(os.path.join(controldir, 'conffiles'), 'w')
+            except OSError:
+                raise bb.build.FuncFailed("unable to open conffiles for writing.")
+            for f in conffiles_str.split():
+                conffiles.write('%s\n' % f)
+            conffiles.close()
+
+        os.chdir(basedir)
+        ret = os.system("PATH=\"%s\" fakeroot dpkg-deb -b %s %s" % (bb.data.getVar("PATH", localdata, 1), root, pkgoutdir))
+        if ret != 0:
+            raise bb.build.FuncFailed("dpkg-deb execution failed")
+
+        for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
+            scriptfile = os.path.join(controldir, script)
+            try:
+                os.remove(scriptfile)
+            except OSError:
+                pass
+        try:
+            os.rmdir(controldir)
+        except OSError:
+            pass
+        del localdata
+}
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
new file mode 100644
index 0000000000..59909d6852
--- /dev/null
+++ b/classes/rootfs_deb.bbclass
@@ -0,0 +1,136 @@
+DEPENDS_prepend = "dpkg-native apt-native fakeroot-native "
+DEPENDS_append = " ${EXTRA_IMAGEDEPENDS}"
+
+fakeroot rootfs_deb_do_rootfs () {
+	set +e
+	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/{info,updates}
+
+	rm -f ${STAGING_DIR}/etc/apt/sources.list.rev
+	rm -f ${STAGING_DIR}/etc/apt/preferences
+	> ${IMAGE_ROOTFS}/var/dpkg/status
+	> ${IMAGE_ROOTFS}/var/dpkg/available
+	# > ${STAGING_DIR}/var/dpkg/status
+
+	priority=1
+	for arch in ${PACKAGE_ARCHS}; do
+		if [ ! -d ${DEPLOY_DIR_DEB}/$arch ]; then
+			continue;
+		fi
+		cd ${DEPLOY_DIR_DEB}/$arch
+		# if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+			rm -f Packages.gz Packages Packages.bz2
+		# fi
+		apt-ftparchive packages . | bzip2 > Packages.bz2
+		echo "Label: $arch" > Release
+
+		echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_DIR}/etc/apt/sources.list.rev
+		(echo "Package: *"
+		echo "Pin: release l=$arch"
+		echo "Pin-Priority: $((800 + $priority))"
+		echo) >> ${STAGING_DIR}/etc/apt/preferences
+		priority=$(expr $priority + 5)
+	done
+
+	tac ${STAGING_DIR}/etc/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
+
+	cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
+		| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
+		> "${STAGING_DIR}/etc/apt/apt-rootfs.conf"
+
+	export APT_CONFIG="${STAGING_DIR}/etc/apt/apt-rootfs.conf"
+	export D=${IMAGE_ROOTFS}
+	export OFFLINE_ROOT=${IMAGE_ROOTFS}
+	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+
+	apt-get update
+
+	_flag () {
+		sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/dpkg/status
+	}
+	_getflag () {
+		cat ${IMAGE_ROOTFS}/var/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}"
+	}
+
+	if [ ! -z "${LINGUAS_INSTALL}" ]; then
+		apt-get install glibc-localedata-i18n
+		if [ $? -eq 1 ]; then
+			exit 1
+		fi
+		for i in ${LINGUAS_INSTALL}; do
+			apt-get install $i
+			if [ $? -eq 1 ]; then
+				exit 1
+			fi
+		done
+	fi
+
+	if [ ! -z "${PACKAGE_INSTALL}" ]; then
+		for i in ${PACKAGE_INSTALL}; do
+			apt-get install $i
+			if [ $? -eq 1 ]; then
+				exit 1
+			fi
+			find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do
+				mv $i `echo $i | sed -e's,\.dpkg-new$,,'`
+			done
+		done
+	fi
+
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}
+	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
+
+	# Mark all packages installed
+	sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" ${IMAGE_ROOTFS}/var/dpkg/status
+
+	# Attempt to run preinsts
+	# Mark packages with preinst failures as unpacked
+	for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.preinst; do
+		if [ -f $i ] && ! sh $i; then
+			_flag unpacked `basename $i .preinst`
+		fi
+	done
+
+	# Attempt to run postinsts
+	# Mark packages with postinst failures as unpacked
+	for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.postinst; do
+		if [ -f $i ] && ! sh $i configure; then
+			_flag unpacked `basename $i .postinst`
+		fi
+	done
+
+	set -e
+
+	# Hacks to make dpkg/ipkg coexist for now
+	mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/
+	if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then
+		rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives
+	fi
+	ln -s /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
+	ln -s /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info
+	ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status
+
+	${ROOTFS_POSTPROCESS_COMMAND}
+
+	log_check rootfs 
+}
+
+rootfs_deb_log_check() {
+	target="$1"
+        lf_path="$2"
+
+	lf_txt="`cat $lf_path`"
+	for keyword_die in "E:"
+	do				
+		if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
+		then
+			echo "log_check: There were error messages in the logfile"
+			echo -e "log_check: Matched keyword: [$keyword_die]\n"
+			echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
+			echo ""
+			do_exit=1				
+		fi
+	done
+	test "$do_exit" = 1 && exit 1						
+	true
+}
+
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
index e63dc61a48..d1541509c5 100644
--- a/conf/distro/angstrom-2007.1-oabi.conf
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -3,9 +3,6 @@ require conf/distro/angstrom-2007.1.conf
 #this is a special version of angstrom for armv4 based machines that can't do EABI
 #see http://wiki.debian.org/ArmEabiPort for details on that
 
-#set compatible machine so people don't 'accidentally' use this 
-COMPATIBLE_MACHINE = "(collie|h3600|h3800|simpad)"
-
 #only glibc based builds are supported ATM
 TARGET_OS = "linux"
 
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 2904db1108..d33ae96c68 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -103,6 +103,11 @@ kernel-module-libata \
 kernel-module-pata-artop \
 "
 
+# Add modules required for Network support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-via-velocity \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 8634d091f0..1091aa2e98 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -103,6 +103,11 @@ kernel-module-libata \
 kernel-module-pata-artop \
 "
 
+# Add modules required for Network support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-via-velocity \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index fe3cdbc481..1c3ae63025 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -20,6 +20,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
 
+#the a780 needs a userspace daemon to stop the BP from shutting down the phone 
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
 ROOT_FLASH_SIZE = "24"
 
 EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf
index b314fa9bea..26b78a6a9d 100644
--- a/conf/machine/include/qemu.conf
+++ b/conf/machine/include/qemu.conf
@@ -7,4 +7,5 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
 
 IMAGE_FSTYPES ?= "tar.bz2 ext2"
 
-ROOT_FLASH_SIZE = "100"
+ROOT_FLASH_SIZE = "200"
+IMAGE_ROOTFS_SIZE_ext2 = "200000"
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index 347c7ba3fb..d3fcd2b017 100644
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -5,7 +5,9 @@
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
 ARCH_BYTE_SEX = "le"
-include conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.conf
+require conf/machine/include/tune-xscale.conf
+
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 371ba927bb..2de34e42c9 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
-MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
new file mode 100644
index 0000000000..dfbd345ae8
--- /dev/null
+++ b/conf/machine/qemux86.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: qemu x86 Emulator setup
+#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
+
+TARGET_ARCH = "i586"
+PACKAGE_EXTRA_ARCHS = "x86"
+
+require conf/machine/include/qemu.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/packages/aspell/aspell_0.50.5.bb b/packages/aspell/aspell_0.50.5.bb
index 8b8c5e779b..f685133121 100644
--- a/packages/aspell/aspell_0.50.5.bb
+++ b/packages/aspell/aspell_0.50.5.bb
@@ -15,6 +15,8 @@ FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir
 
 inherit autotools
 
+export CXXFLAGS += "-lstdc++"
+
 do_compile_prepend() {
 	install ${WORKDIR}/mk-dirs_h.py ${S}/common/mk-dirs_h
 }
diff --git a/packages/ezx/ezx-boot-usb-native_0.1.0.bb b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
new file mode 100644
index 0000000000..5919f28a11
--- /dev/null
+++ b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2"
+S = "${WORKDIR}/boot_usb-${PV}"
+
+inherit native
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	:
+}
+
+addtask deploy before do_build after do_compile
diff --git a/packages/ezx/ezx-boot-usb-native_1877.bb b/packages/ezx/ezx-boot-usb-native_svn.bb
index 5fe3294fee..64e8a486e0 100644
--- a/packages/ezx/ezx-boot-usb-native_1877.bb
+++ b/packages/ezx/ezx-boot-usb-native_svn.bb
@@ -5,7 +5,12 @@ AUTHOR = "Harald Welte"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${PV}"
+DEFAULT_PREFERENCE = "-1"
+
+REV = "1922"
+PV = "0.1.0+r${REV}"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${REV}"
 S = "${WORKDIR}/boot_usb"
 
 inherit native
diff --git a/packages/gnome/gnome-vfs-dbus/.mtn2git_empty b/packages/ezx/opentapi/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/gnome-vfs-dbus/.mtn2git_empty
+++ b/packages/ezx/opentapi/.mtn2git_empty
diff --git a/packages/ezx/opentapi/opentapi.init b/packages/ezx/opentapi/opentapi.init
new file mode 100644
index 0000000000..6b78c1574c
--- /dev/null
+++ b/packages/ezx/opentapi/opentapi.init
@@ -0,0 +1,82 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# init.d script for opentapi
+
+set -e
+
+DAEMON=/usr/bin/opentapi
+NAME=opentapi
+PIDDIR=/var/run/opentapi
+PIDFILE=$PIDDIR/pid
+DESC="OpenTAPI server"
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/opentapi ]; then
+  . /etc/default/opentapis
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    -exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      run-parts --reverse --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE 
+   
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  restart|force-reload)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb
index e27aa68b97..a617f5b45b 100644
--- a/packages/ezx/opentapi_svn.bb
+++ b/packages/ezx/opentapi_svn.bb
@@ -3,12 +3,23 @@ LICENSE = "GPLv2"
 
 PV = "0.0+svn${SRCDATE}"
 
-SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http"
+SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \
+           file://opentapi.init \
+          "
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "opentapi"
+INITSCRIPT_PARAMS = "defaults"
+
 
 S = "${WORKDIR}/${PN}"
 
 do_install() {
 	install -d ${D}${bindir}
 	install -m 755 opentapi ${D}${bindir}
+        
+	install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/opentapi.init ${D}${sysconfdir}/init.d/opentapi
 }
 
diff --git a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch
deleted file mode 100644
index 38480c21e1..0000000000
--- a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- trunk/dbus-daemon/vfs-daemon.c.orig	2006-08-09 10:43:26.000000000 +0100
-+++ trunk/dbus-daemon/vfs-daemon.c	2006-08-09 10:45:59.000000000 +0100
-@@ -91,7 +91,7 @@
- 		g_warning ("Failed to acquire vfs-daemon service: %s", error.message);
- 		dbus_error_free (&error);
- 
--		dbus_connection_disconnect (conn);
-+		dbus_connection_close (conn);
- 		dbus_connection_unref (conn);
- 		conn = NULL;
- 
-@@ -101,7 +101,7 @@
- 	if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) {
- 		g_printerr ("VFS daemon already running, exiting.\n");
- 
--		dbus_connection_disconnect (conn);
-+		dbus_connection_close (conn);
- 		dbus_connection_unref (conn);
- 		conn = NULL;
- 
-@@ -111,7 +111,7 @@
- 	if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
- 		g_printerr ("Not primary owner of the service, exiting.\n");
- 
--		dbus_connection_disconnect (conn);
-+		dbus_connection_close (conn);
- 		dbus_connection_unref (conn);
- 		conn = NULL;
- 
-@@ -124,7 +124,7 @@
- 						   NULL)) {
- 		g_printerr ("Failed to register object with D-BUS.\n");
- 
--		dbus_connection_disconnect (conn);
-+		dbus_connection_close (conn);
- 		dbus_connection_unref (conn);
- 		conn = NULL;
- 
-@@ -152,7 +152,7 @@
- 		return;
- 	}
- 
--	dbus_connection_disconnect (conn);
-+	dbus_connection_close (conn);
- 	dbus_connection_unref (conn);
- }
- 
---- trunk/dbus-daemon/daemon-connection.c.orig	2006-08-09 10:43:32.000000000 +0100
-+++ trunk/dbus-daemon/daemon-connection.c	2006-08-09 10:46:26.000000000 +0100
-@@ -321,7 +321,7 @@
- 	d(g_print ("Last unref\n"));
- 
- 	if (dbus_connection_get_is_connected (conn->conn)) {
--		dbus_connection_disconnect (conn->conn);
-+		dbus_connection_close (conn->conn);
- 	}
- 	dbus_connection_unref (conn->conn);
- 
---- trunk/dbus-daemon/dbus-method.c.orig	2006-08-09 10:43:38.000000000 +0100
-+++ trunk/dbus-daemon/dbus-method.c	2006-08-09 10:46:57.000000000 +0100
-@@ -220,7 +220,7 @@
- 	if (!dbus_connection_add_filter (dbus_conn, message_handler,
- 					 NULL, NULL)) {
- 		g_warning ("Failed to add filter to the connection.");
--		dbus_connection_disconnect (dbus_conn);
-+		dbus_connection_close (dbus_conn);
- 		dbus_connection_unref (dbus_conn);
- 
- 		dbus_conn = NULL;
-@@ -1666,7 +1666,7 @@
- vfs_module_shutdown (GnomeVFSMethod* method)
- {
- 	if (dbus_conn) {
--		dbus_connection_disconnect (dbus_conn);
-+		dbus_connection_close (dbus_conn);
- 		dbus_connection_unref (dbus_conn);
- 
- 		dbus_conn = NULL;
diff --git a/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch b/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch
deleted file mode 100644
index 3dbc130ddc..0000000000
--- a/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-vfs-2.6.0/configure.in~	2004-03-22 12:36:23.000000000 +0000
-+++ gnome-vfs-2.6.0/configure.in	2004-06-07 16:04:34.000000000 +0100
-@@ -154,7 +154,7 @@
- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
- 
- if test x"$GCONFTOOL" = xno; then
--  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-+  AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
- fi
- 
- AM_GCONF_SOURCE_2
diff --git a/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch b/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch
deleted file mode 100644
index 87bf7c3939..0000000000
--- a/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- trunk/libgnomevfs/gnome-vfs-resolve.c.orig	2006-02-08 19:18:43.000000000 +0100
-+++ trunk/libgnomevfs/gnome-vfs-resolve.c	2006-02-08 19:21:42.000000000 +0100
-@@ -23,7 +23,6 @@
- 
- #include <errno.h>
- #include <string.h>
--#include <glib.h>
- #ifndef G_OS_WIN32
- /* Keep <sys/types.h> above the network includes for FreeBSD. */
- #include <sys/types.h>
-@@ -48,6 +47,7 @@
- #define RELOAD_TIMEVAL 2
- #endif
- 
-+#include <glib.h>
- #include <glib-object.h>
- 
- #include <libgnomevfs/gnome-vfs-resolve.h>
diff --git a/packages/gnome/gnome-vfs-dbus/gssapi.patch b/packages/gnome/gnome-vfs-dbus/gssapi.patch
deleted file mode 100644
index a4fcd605f2..0000000000
--- a/packages/gnome/gnome-vfs-dbus/gssapi.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- gnome-vfs-dbus-2.8.4.4/configure.in~gssapi
-+++ gnome-vfs-dbus-2.8.4.4/configure.in
-@@ -456,6 +456,10 @@
-    ])
-    LIBS="$saved_LIBS" 
-    CPPFLAGS="$saved_CPPFLAGS" 
-+   if test "x$have_gssapi" != "xyes"; then
-+     GSSAPI_LIBS=
-+     GSSAPI_CFLAGS=
-+   fi
- fi   
- AC_SUBST(GSSAPI_LIBS)
- AC_SUBST(GSSAPI_CFLAGS)
diff --git a/packages/gnome/gnome-vfs-dbus/werror_compile.patch b/packages/gnome/gnome-vfs-dbus/werror_compile.patch
deleted file mode 100644
index f2eba7d712..0000000000
--- a/packages/gnome/gnome-vfs-dbus/werror_compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-vfs-dbus-2.8.4.4/configure.in.old	2006-01-26 11:56:09.000000000 +0100
-+++ gnome-vfs-dbus-2.8.4.4/configure.in	2006-01-26 11:45:02.000000000 +0100
-@@ -279,7 +279,7 @@
- 
- if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
- 	echo "enable compile warnings = $set_more_warnings"
--	VFS_CFLAGS="-Wall -Werror \
-+	VFS_CFLAGS="-Wall \
- 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
- 	-Wnested-externs -Wpointer-arith"
- 
diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
deleted file mode 100644
index 5717115ebc..0000000000
--- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
+++ /dev/null
@@ -1,91 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-PR = "r1"
-PROVIDES = "gnome-vfs"
-RPROVIDES = "gnome-vfs"
-
-inherit gnome pkgconfig
-
-DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14a"
-RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
-
-
-SRC_URI = "http://ftp.imendio.com/pub/extra/${PN}/${PN}-${PV}.tar.gz \
-           file://gssapi.patch;patch=1;pnum=1 \
-           file://gconftool-lossage.patch;patch=1;pnum=1"
-
-EXTRA_OECONF = "--with-ipc=dbus"
-
-FILES_${PN} += " ${libdir}/vfs"
-FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
-FILES_${PN}-doc += " ${datadir}/gtk-doc"
-
-GNOME_VFS_HEADERS = " \
-gnome-vfs-utils.h \
-gnome-vfs-application-registry.h \
-gnome-vfs-async-ops.h \
-gnome-vfs-ops.h \
-gnome-vfs-uri.h \
-gnome-vfs-standard-callbacks.h \
-gnome-vfs-module-callback.h \
-gnome-vfs-context.h \
-gnome-vfs-file-info.h \
-gnome-vfs-directory.h \
-gnome-vfs-mime-monitor.h \
-gnome-vfs-mime-handlers.h \
-gnome-vfs-result.h \
-gnome-vfs-job-limit.h \
-gnome-vfs-file-size.h \
-gnome-vfs-mime-utils.h \
-gnome-vfs-find-directory.h \
-gnome-vfs-init.h \
-gnome-vfs-handle.h \
-gnome-vfs.h \
-gnome-vfs-cancellation.h \
-gnome-vfs-xfer.h \
-gnome-vfs-monitor.h \
-gnome-vfs-types.h \
-gnome-vfs-volume-monitor.h \
-gnome-vfs-drive.h \
-gnome-vfs-volume.h \
-gnome-vfs-enum-types.h \
-gnome-vfs-address.h \
-gnome-vfs-dns-sd.h \
-gnome-vfs-mime-info-cache.h \
-gnome-vfs-resolve.h"
-
-GNOME_VFS_MODULE_HEADERS = " \
-gnome-vfs-mime-info.h \
-gnome-vfs-transform.h \
-gnome-vfs-ssl.h \
-gnome-vfs-inet-connection.h \
-gnome-vfs-socket.h \
-gnome-vfs-parse-ls.h \
-gnome-vfs-method.h \
-gnome-vfs-cancellable-ops.h \
-gnome-vfs-module.h \
-gnome-vfs-module-shared.h \
-gnome-vfs-module-callback-module-api.h \
-gnome-vfs-mime.h \
-gnome-vfs-socket-buffer.h"
-
-do_stage() {
-	oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
-	for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
-	install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
-	for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
-
-PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
-
-python populate_packages_prepend () {
-	print bb.data.getVar('FILES_gnome-vfs', d, 1)
-
-	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
-	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
-}
diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb
deleted file mode 100644
index 7a48fb6ca3..0000000000
--- a/packages/gnome/gnome-vfs-dbus_svn.bb
+++ /dev/null
@@ -1,110 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-PR = "r1"
-PROVIDES = "gnome-vfs"
-RPROVIDES = "gnome-vfs"
-
-PV = "2.8.4.4+svn${SRCDATE}"
-
-inherit gnome pkgconfig
-
-DEPENDS = "gtk-doc-native libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14a"
-RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
-
-
-SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \
-           file://gssapi.patch;patch=1;pnum=1 \
-           file://gconftool-lossage.patch;patch=1;pnum=1 \
-           file://glib-after-nameser.patch;patch=1;pnum=1 \
-	   file://gtk-doc.m4 \
-	   file://gtk-doc.make \
-	   file://werror_compile.patch;patch=1;pnum=1 \
-	   file://dbus-api-change.patch;patch=1"
-
-EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc"
-S = "${WORKDIR}/trunk"
-
-FILES_${PN} += " ${libdir}/vfs"
-FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
-#FILES_${PN}-doc += " ${datadir}/gtk-doc"
-
-GNOME_VFS_HEADERS = " \
-gnome-vfs-utils.h \
-gnome-vfs-application-registry.h \
-gnome-vfs-async-ops.h \
-gnome-vfs-ops.h \
-gnome-vfs-uri.h \
-gnome-vfs-standard-callbacks.h \
-gnome-vfs-module-callback.h \
-gnome-vfs-context.h \
-gnome-vfs-file-info.h \
-gnome-vfs-directory.h \
-gnome-vfs-mime-monitor.h \
-gnome-vfs-mime-handlers.h \
-gnome-vfs-mime-deprecated.h \
-gnome-vfs-result.h \
-gnome-vfs-job-limit.h \
-gnome-vfs-file-size.h \
-gnome-vfs-mime-utils.h \
-gnome-vfs-find-directory.h \
-gnome-vfs-init.h \
-gnome-vfs-handle.h \
-gnome-vfs.h \
-gnome-vfs-cancellation.h \
-gnome-vfs-xfer.h \
-gnome-vfs-monitor.h \
-gnome-vfs-types.h \
-gnome-vfs-volume-monitor.h \
-gnome-vfs-drive.h \
-gnome-vfs-volume.h \
-gnome-vfs-enum-types.h \
-gnome-vfs-address.h \
-gnome-vfs-dns-sd.h \
-gnome-vfs-mime-info-cache.h \
-gnome-vfs-resolve.h"
-
-GNOME_VFS_MODULE_HEADERS = " \
-gnome-vfs-mime-info.h \
-gnome-vfs-transform.h \
-gnome-vfs-ssl.h \
-gnome-vfs-inet-connection.h \
-gnome-vfs-socket.h \
-gnome-vfs-parse-ls.h \
-gnome-vfs-method.h \
-gnome-vfs-cancellable-ops.h \
-gnome-vfs-module.h \
-gnome-vfs-module-shared.h \
-gnome-vfs-module-callback-module-api.h \
-gnome-vfs-mime.h \
-gnome-vfs-socket-buffer.h"
-
-do_configure_prepend() {
-	mkdir -p m4
-	install ${WORKDIR}/gtk-doc.m4 ./m4/
-	install ${WORKDIR}/gtk-doc.make ./
-}
-
-do_compile_prepend() {
-    find ${S} -name Makefile | xargs sed -i 's:-Werror::'
-}
-
-do_stage() {
-	oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
-	for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
-	install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
-	for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
-
-PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
-
-python populate_packages_prepend () {
-	print bb.data.getVar('FILES_gnome-vfs', d, 1)
-
-	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
-	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
-}
diff --git a/packages/gnome/kanjipad_svn.bb b/packages/gnome/kanjipad_svn.bb
new file mode 100644
index 0000000000..95bd174b6d
--- /dev/null
+++ b/packages/gnome/kanjipad_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "KanjiPad is a very simple program for handwriting recognition"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk perl-native"
+
+PV = "2.0.0+svn${SRCDATE}"
+
+inherit pkgconfig 
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
+
+S = "${WORKDIR}/trunk"
+
+do_compile_prepend() {
+	export CFLAGS='${TARGET_CFLAGS}  -DFOR_PILOT_COMPAT -DKP_LIBDIR="${libdir}/kanjipad" -DBINDIR="${bindir}" `pkg-config --cflags gtk+-2.0` `pkg-config --cflags glib-2.0`'
+}
+
+
+
diff --git a/packages/gnome/libbacon_cvs.bb b/packages/gnome/libbacon_svn.bb
index ce4b72ccab..2f36c3d808 100644
--- a/packages/gnome/libbacon_cvs.bb
+++ b/packages/gnome/libbacon_svn.bb
@@ -3,13 +3,13 @@ LICENSE = "GPLv2"
 
 DEPENDS = "glib-2.0"
 
-PV = "0.0+cvs${SRCDATE}"
+PV = "0.0+svn${SRCDATE}"
 
 inherit gnome
 
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=${PN}"
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/trunk"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/jhead/jhead_2.6.0.bb b/packages/jhead/jhead_2.6.0.bb
index d37dc0c733..3779c1ec34 100644
--- a/packages/jhead/jhead_2.6.0.bb
+++ b/packages/jhead/jhead_2.6.0.bb
@@ -11,3 +11,8 @@ inherit autotools
 do_configure() {
 	:
 }
+
+do_install() {
+	install -d ${D}/bin
+	autotools_do_install
+}
diff --git a/packages/libusb/libusb_0.1.12.bb b/packages/libusb/libusb_0.1.12.bb
index a2b80ecb6d..43c6ea92bd 100644
--- a/packages/libusb/libusb_0.1.12.bb
+++ b/packages/libusb/libusb_0.1.12.bb
@@ -9,29 +9,25 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz"
 
 S = "${WORKDIR}/libusb-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig lib_package
 
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-build-docs"
 
+export CXXFLAGS += "-lstdc++"
+
 do_stage() {
-	oe_libinstall -a -so libusb ${STAGING_LIBDIR}
 
-        install -d ${STAGING_BINDIR}
+	autotools_stage_all
 	install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
 	# can we get rid of that? wouldn't a sed statement do as well?
-	perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
+	sed -i 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
 
 	if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
 	        install -d ${STAGING_BINDIR_CROSS}/
 		mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
 	fi
 
-        install -d ${STAGING_INCDIR}/
-        for X in usb.h
-        do
-                install -m 0644 ${S}/$X ${STAGING_INCDIR}/$X
-        done
 }
 
 PACKAGES =+ "libusbpp"
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 321d24a035..6ee29d3d9a 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "644"
+IXP4XX_KERNEL_SVN_REV = "647"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/linux-efika/defconfig b/packages/linux/linux-efika/defconfig
index 41529d9678..05a06b6c5e 100644
--- a/packages/linux/linux-efika/defconfig
+++ b/packages/linux/linux-efika/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.19-rc6
-# Mon Nov 27 17:09:56 2006
+# Sun Dec 31 01:46:08 2006
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -1413,6 +1413,11 @@ CONFIG_SND_VIA82XX_MODEM=m
 #
 
 #
+# ALSA PPC devices
+#
+CONFIG_SND_PPC_MPC52xx_AC97=m
+
+#
 # USB devices
 #
 CONFIG_SND_USB_AUDIO=m
diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index ff9b958eb3..679bd667d5 100644
--- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -6,8 +6,11 @@ PR = "r1"
 COMPATIBLE_MACHINE = "efika"
 
 SRC_URI = "http://www.efika.de/download/linux-2.6.19-rc6_efika.tgz \
+           http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
+           http://www.246tnt.com/files/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \
            file://defconfig \
 		   "
+#           http://lkml.org/lkml/2006/11/29/335;patch=1 \
 
 S = "${WORKDIR}/linux-2.6.19-rc6_efika"
 
diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index 4620537aa1..3df216d616 100644
--- a/packages/linux/linux-rp_2.6.19+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -15,9 +15,10 @@ DEFAULT_PREFERENCE = "-1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc2 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1;status=merged \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13pre1.patch;patch=1;status=merged \
+           ${RPSRC}/asoc_13pre1_fix-r0.patch;patch=1 \
            ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1;status=merged \
-           ${RPSRC}/backlight_parameter_fix-r0.patch;patch=1;status=pending \
+           ${RPSRC}/backlight_parameter_fix-r1.patch;patch=1;status=pending \
            ${RPSRC}/hx2750_base-r28.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r8.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -31,7 +32,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \
-           ${DOSRC}/kexec-arm-r4.patch;patch=1 \
+           ${RPSRC}/kexec-arm-r4.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
diff --git a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
index b06df25359..ceda4ff811 100644
--- a/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
+++ b/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GPS navigation/map display software"
 LICENSE = "GPL"
-DEPENDS = "sqlite3 gtk+ gnome-vfs-dbus dbus bluez-libs"
+DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs"
 RDEPENDS = "bluez-utils"
 PV = "1.2.4+svn${SRCDATE}"
 PR = "r1"
diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index 47f0cfe39f..9a1d928a77 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -36,6 +36,7 @@ ALLOW_EMPTY = "1"
 #	wpa-supplicant \
 #	bluez-utils-nodbus \
 #	libxml2 \
+#	libdvb \
 #	madwifi-ng \
 #	motion \
 #	ftpd-topfield \
@@ -105,7 +106,6 @@ OPENPROTIUM_PACKAGES = "\
 	lcdproc \
 	less \
 	libao \
-	libdvb \
 	libid3tag \
 	liblockfile \
 	libmad \
diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb
index 2a379d9343..9019ffc1a9 100644
--- a/packages/tinymail/tinymail_svn.bb
+++ b/packages/tinymail/tinymail_svn.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 gnome-vfs-dbus gconf-dbus libgnomeui"
+DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui"
 DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices"
 LICENSE = "GPL"
 
diff --git a/packages/uboot/u-boot_1.1.6.bb b/packages/uboot/u-boot_1.1.6.bb
new file mode 100644
index 0000000000..b45e86611b
--- /dev/null
+++ b/packages/uboot/u-boot_1.1.6.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "U-boot bootloader"
+PROVIDES = "virtual/bootloader"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+UBOOT_MACHINE ?= "${MACHINE}_config"
+UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_compile () {
+	unset LDFLAGS
+	unset CFLAGS
+	unset CPPFLAGS
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake all
+}
+
+do_stage() {
+	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
+}
+
+do_deploy () {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile