move layer into meta-oe in preparation for future splits

As per TSC decision

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

582 files changed, 2397 insertions, 0 deletions

diff --git a/meta-oe/COPYING.MIT b/meta-oe/COPYING.MIT
new file mode 100644
index 000000000..fb950dc69
--- /dev/null
+++ b/meta-oe/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/README b/meta-oe/README
index b7fd05dd4..b7fd05dd4 100644
--- a/README
+++ b/meta-oe/README
diff --git a/classes/gnome.bbclass b/meta-oe/classes/gnome.bbclass
index 0a32a7796..0a32a7796 100644
--- a/classes/gnome.bbclass
+++ b/meta-oe/classes/gnome.bbclass
diff --git a/classes/gnomebase.bbclass b/meta-oe/classes/gnomebase.bbclass
index b50504f98..b50504f98 100644
--- a/classes/gnomebase.bbclass
+++ b/meta-oe/classes/gnomebase.bbclass
diff --git a/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 13670f667..13670f667 100644
--- a/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
diff --git a/classes/mime.bbclass b/meta-oe/classes/mime.bbclass
index b9cdd7bec..b9cdd7bec 100644
--- a/classes/mime.bbclass
+++ b/meta-oe/classes/mime.bbclass
diff --git a/classes/qmake_base.bbclass b/meta-oe/classes/qmake_base.bbclass
index 577c0fab3..577c0fab3 100644
--- a/classes/qmake_base.bbclass
+++ b/meta-oe/classes/qmake_base.bbclass
diff --git a/classes/qt4e.bbclass b/meta-oe/classes/qt4e.bbclass
index 303b79b8a..303b79b8a 100644
--- a/classes/qt4e.bbclass
+++ b/meta-oe/classes/qt4e.bbclass
diff --git a/classes/siteinfo.bbclass b/meta-oe/classes/siteinfo.bbclass
index c0db539e2..c0db539e2 100644
--- a/classes/siteinfo.bbclass
+++ b/meta-oe/classes/siteinfo.bbclass
diff --git a/conf/layer.conf b/meta-oe/conf/layer.conf
index 9fa60c1c4..9fa60c1c4 100644
--- a/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
diff --git a/conf/machine/include/davinci.inc b/meta-oe/conf/machine/include/davinci.inc
index 3e48097eb..3e48097eb 100644
--- a/conf/machine/include/davinci.inc
+++ b/meta-oe/conf/machine/include/davinci.inc
diff --git a/conf/machine/include/omap3.inc b/meta-oe/conf/machine/include/omap3.inc
index 15e34c650..15e34c650 100644
--- a/conf/machine/include/omap3.inc
+++ b/meta-oe/conf/machine/include/omap3.inc
diff --git a/conf/machine/include/omapl138.inc b/meta-oe/conf/machine/include/omapl138.inc
index 4c222753d..4c222753d 100644
--- a/conf/machine/include/omapl138.inc
+++ b/meta-oe/conf/machine/include/omapl138.inc
diff --git a/conf/machine/include/tune-arm926ejs.inc b/meta-oe/conf/machine/include/tune-arm926ejs.inc
index f41e46099..f41e46099 100644
--- a/conf/machine/include/tune-arm926ejs.inc
+++ b/meta-oe/conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/include/tune-cortexa8.inc b/meta-oe/conf/machine/include/tune-cortexa8.inc
index 2ac0ebfe4..2ac0ebfe4 100644
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/meta-oe/conf/machine/include/tune-cortexa8.inc
diff --git a/meta-oe/patches/0001-kernel-bbclass-merge-in-OE-improvements-for-mkimage-.patch b/meta-oe/patches/0001-kernel-bbclass-merge-in-OE-improvements-for-mkimage-.patch
new file mode 100644
index 000000000..7283df8df
--- /dev/null
+++ b/meta-oe/patches/0001-kernel-bbclass-merge-in-OE-improvements-for-mkimage-.patch
@@ -0,0 +1,109 @@
+From 65780d06117be92941b3c5404dc31597b6807263 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sun, 23 Jan 2011 10:58:46 +0100
+Subject: [PATCH] kernel bbclass: merge in OE improvements for mkimage, PR and initramfs
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ classes/kernel.bbclass |   60 +++++++++++++++++++++++++++++++++++------------
+ 1 files changed, 44 insertions(+), 16 deletions(-)
+
+diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
+index 827046e..d94930b 100644
+--- a/classes/kernel.bbclass
++++ b/classes/kernel.bbclass
+@@ -14,8 +14,20 @@ python __anonymous () {
+        depends = bb.data.getVar("DEPENDS", d, 1)
+        depends = "%s u-boot-mkimage-native" % depends
+        bb.data.setVar("DEPENDS", depends, d)
++
++    image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
++    if image != '' and image is not None:
++        bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
++
++    machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
++
++    if machine_kernel_pr:
++       bb.data.setVar('PR', machine_kernel_pr, d)
+ }
+ 
++INITRAMFS_IMAGE ?= ""
++INITRAMFS_TASK ?= ""
++
+ inherit kernel-arch deploy
+ 
+ PACKAGES_DYNAMIC += "kernel-module-*"
+@@ -196,8 +208,17 @@ sysroot_stage_all_append() {
+ 
+ kernel_do_configure() {
+         yes '' | oe_runmake oldconfig
++       if [ ! -z "${INITRAMFS_IMAGE}" ]; then
++               for img in cpio.gz cpio.lzo cpio.lzma; do
++               if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
++                       cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
++               fi
++               done
++       fi
+ }
+ 
++kernel_do_configure[depends] += "${INITRAMFS_TASK}"
++
+ do_menuconfig() {
+        export TERMWINDOWTITLE="${PN} Kernel Configuration"
+        export SHELLCMDS="make menuconfig"
+@@ -476,6 +497,29 @@ do_sizecheck() {
+ 
+ addtask sizecheck before do_install after do_compile
+ 
++do_uboot_mkimage() {
++    if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
++        ENTRYPOINT=${UBOOT_ENTRYPOINT}
++        if test -n "${UBOOT_ENTRYSYMBOL}"; then
++            ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
++                   awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
++        fi
++        if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
++            ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
++            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
++            rm -f linux.bin
++        else
++            ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
++            rm -f linux.bin.gz
++            gzip -9 linux.bin
++            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
++            rm -f linux.bin.gz
++        fi
++    fi
++}
++
++addtask uboot_mkimage before do_install after do_compile
++
+ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+ # Don't include the DATETIME variable in the sstate package signatures
+ KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
+@@ -487,22 +531,6 @@ kernel_do_deploy() {
+                tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
+        fi
+ 
+-       if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+-               if test -e arch/${ARCH}/boot/uImage ; then
+-                       cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+-               elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+-                       ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+-                       uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+-                       rm -f linux.bin
+-               else
+-                       ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+-                       rm -f linux.bin.gz
+-                       gzip -9 linux.bin
+-                       uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+-                       rm -f linux.bin.gz
+-               fi
+-       fi
+-
+        cd ${DEPLOYDIR}
+        rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+        ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+-- 
+1.6.6.1
+
diff --git a/meta-oe/patches/kernel-temp b/meta-oe/patches/kernel-temp
new file mode 100644
index 000000000..3bbcfe955
--- /dev/null
+++ b/meta-oe/patches/kernel-temp
@@ -0,0 +1,33 @@
+diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
+index d94930b..2a0f3da 100644
+--- a/classes/kernel.bbclass
++++ b/classes/kernel.bbclass
+@@ -220,6 +196,9 @@ kernel_do_configure() {
+ kernel_do_configure[depends] += "${INITRAMFS_TASK}"
+ 
+ do_menuconfig() {
++        export DISPLAY='${DISPLAY}'
++        export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
++        export XAUTHORITY='${XAUTHORITY}'
+        export TERMWINDOWTITLE="${PN} Kernel Configuration"
+        export SHELLCMDS="make menuconfig"
+        ${TERMCMDRUN}
+@@ -318,13 +297,16 @@ module_conf_rfcomm = "alias bt-proto-3 rfcomm"
+ 
+ python populate_packages_prepend () {
+        def extract_modinfo(file):
+-               import re
+-               tmpfile = os.tmpnam()
++               import tempfile, re
++               tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1)
++               tf = tempfile.mkstemp()
++               tmpfile = tf[1]
+                cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (bb.data.getVar("PATH", d, 1), bb.data.getVar("HOST_PREFIX", d, 1) or "", file, tmpfile)
+                os.system(cmd)
+                f = open(tmpfile)
+                l = f.read().split("\000")
+                f.close()
++               os.close(tf[0])
+                os.unlink(tmpfile)
+                exp = re.compile("([^=]+)=(.*)")
+                vals = {}
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc b/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
new file mode 100644
index 000000000..d114f89ea
--- /dev/null
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
@@ -0,0 +1,46 @@
+DESCRIPTION = "GNU Radio"
+URL = "http://gnuradio.org"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPLv3"
+DEPENDS = "uhd gsl guile-native fftwf python alsa-lib boost cppunit swig-native python-numpy"
+INC_PR = "r8"
+
+inherit distutils-base autotools pkgconfig
+
+export BUILD_SYS
+export HOST_SYS=${MULTIMACH_TARGET_SYS}
+
+EXTRA_OECONF = " \
+  --program-prefix= \
+  --disable-gr-atsc \
+  --enable-gr-audio-alsa  \
+  --disable-gr-audio-jack \
+  --disable-html-docs \
+  --with-boost=${STAGING_DIR_TARGET}/usr \
+  --disable-usrp1 \
+  --disable-usrp2 \
+  --with-pythondir=${PYTHON_SITEPACKAGES_DIR} \
+  PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR} \
+"
+
+RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils \
+                  python-shell python-pickle python-compiler python-pkgutil python-pydoc python-mmap \
+                  python-netclient python-unittest python-difflib python-pprint python-numpy \
+"
+
+PACKAGES =+ "\
+  ${PN}-examples \
+  ${PN}-grc \
+  ${PN}-conf \
+"
+
+FILES_${PN}-examples = "${datadir}/gnuradio/examples"
+FILES_${PN}-grc = "${datadir}/gnuradio/grc"
+FILES_${PN}-conf = "${sysconfdir}/gnuradio"
+
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*"
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \
+                    ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \
+                   "
+
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
new file mode 100644
index 000000000..757a80136
--- /dev/null
+++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
@@ -0,0 +1,16 @@
+require gnuradio.inc
+
+PR = "${INC_PR}.1"
+PV = "3.3.0-${PR}+gitr${SRCREV}"
+
+SRCREV = "cdca1c917626f7c63f820da921a17187efc92cd5"
+
+# Make it easy to test against developer repos and branches
+GIT_REPO = "gnuradio.git"
+GIT_BRANCH = "next"
+
+SRC_URI = "git://gnuradio.org/git/${GIT_REPO};branch=${GIT_BRANCH};protocol=http \
+"
+
+S="${WORKDIR}/git"
+
diff --git a/recipes-connectivity/openssl/ocf-linux.inc b/meta-oe/recipes-connectivity/openssl/ocf-linux.inc
index b98f887ff..b98f887ff 100644
--- a/recipes-connectivity/openssl/ocf-linux.inc
+++ b/meta-oe/recipes-connectivity/openssl/ocf-linux.inc
diff --git a/recipes-connectivity/openssl/ocf-linux_20100325.bb b/meta-oe/recipes-connectivity/openssl/ocf-linux_20100325.bb
index 9dccc3c32..9dccc3c32 100644
--- a/recipes-connectivity/openssl/ocf-linux_20100325.bb
+++ b/meta-oe/recipes-connectivity/openssl/ocf-linux_20100325.bb
diff --git a/recipes-connectivity/openssl/openssl-0.9.8m/configure-targets.patch b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/configure-targets.patch
index b68123a23..b68123a23 100644
--- a/recipes-connectivity/openssl/openssl-0.9.8m/configure-targets.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/configure-targets.patch
diff --git a/recipes-connectivity/openssl/openssl-0.9.8m/debian.patch b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/debian.patch
index 60e338816..60e338816 100644
--- a/recipes-connectivity/openssl/openssl-0.9.8m/debian.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/debian.patch
diff --git a/recipes-connectivity/openssl/openssl-0.9.8m/oe-ldflags.patch b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/oe-ldflags.patch
index 3a2fae64d..3a2fae64d 100644
--- a/recipes-connectivity/openssl/openssl-0.9.8m/oe-ldflags.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/oe-ldflags.patch
diff --git a/recipes-connectivity/openssl/openssl-0.9.8m/shared-libs.patch b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/shared-libs.patch
index 0aaef169c..0aaef169c 100644
--- a/recipes-connectivity/openssl/openssl-0.9.8m/shared-libs.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/shared-libs.patch
diff --git a/recipes-connectivity/openssl/openssl-1.0.0c/configure-targets.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/configure-targets.patch
index 22f8743e7..22f8743e7 100644
--- a/recipes-connectivity/openssl/openssl-1.0.0c/configure-targets.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/configure-targets.patch
diff --git a/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch
index 1cd6e1196..1cd6e1196 100644
--- a/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch
diff --git a/recipes-connectivity/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch
index 949d6ad8c..949d6ad8c 100644
--- a/recipes-connectivity/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch
diff --git a/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch
index 1fda69ba9..1fda69ba9 100644
--- a/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch
diff --git a/recipes-connectivity/openssl/openssl-1.0.0c/oe-ldflags.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/oe-ldflags.patch
index 3dd3bedab..3dd3bedab 100644
--- a/recipes-connectivity/openssl/openssl-1.0.0c/oe-ldflags.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/oe-ldflags.patch
diff --git a/recipes-connectivity/openssl/openssl-1.0.0c/shared-libs.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/shared-libs.patch
index 7cd70d8fd..7cd70d8fd 100644
--- a/recipes-connectivity/openssl/openssl-1.0.0c/shared-libs.patch
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/shared-libs.patch
diff --git a/recipes-connectivity/openssl/openssl-native_1.0.0c.bb b/meta-oe/recipes-connectivity/openssl/openssl-native_1.0.0c.bb
index 8483293b9..8483293b9 100644
--- a/recipes-connectivity/openssl/openssl-native_1.0.0c.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl-native_1.0.0c.bb
diff --git a/recipes-connectivity/openssl/openssl.inc b/meta-oe/recipes-connectivity/openssl/openssl.inc
index 86b29f0af..86b29f0af 100644
--- a/recipes-connectivity/openssl/openssl.inc
+++ b/meta-oe/recipes-connectivity/openssl/openssl.inc
diff --git a/recipes-connectivity/openssl/openssl_0.9.8m.bb b/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb
index a7eb33285..a7eb33285 100644
--- a/recipes-connectivity/openssl/openssl_0.9.8m.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb
diff --git a/recipes-connectivity/openssl/openssl_1.0.0c.bb b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0c.bb
index 9348e53c8..9348e53c8 100644
--- a/recipes-connectivity/openssl/openssl_1.0.0c.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0c.bb
diff --git a/recipes-connectivity/uhd/uhd-firmware.inc b/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc
index 763aa6ca5..763aa6ca5 100644
--- a/recipes-connectivity/uhd/uhd-firmware.inc
+++ b/meta-oe/recipes-connectivity/uhd/uhd-firmware.inc
diff --git a/recipes-connectivity/uhd/uhd-firmware_0001.20101124013843.905f426.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_0001.20101124013843.905f426.bb
index 7fc8dde33..7fc8dde33 100644
--- a/recipes-connectivity/uhd/uhd-firmware_0001.20101124013843.905f426.bb
+++ b/meta-oe/recipes-connectivity/uhd/uhd-firmware_0001.20101124013843.905f426.bb
diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc
new file mode 100644
index 000000000..d2ffb848f
--- /dev/null
+++ b/meta-oe/recipes-connectivity/uhd/uhd.inc
@@ -0,0 +1,27 @@
+DESCRIPTION = "Universal Hardware Driver for Ettus Research products."
+HOMEPAGE = "http://www.ettus.com"
+LICENSE = "GPLV3+"
+
+DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware"
+RDEPENDS_${PN} += "uhd-firmware"
+
+INC_PR = "r4"
+
+inherit cmake
+
+PACKAGES =+ "${PN}-tests ${PN}-examples"
+
+FILES_${PN} += "${libdir}/libuhd.so"
+FILES_${PN} += "${datadir}/uhd/utils/*"
+FILES_${PN}-tests += "${datadir}/uhd/tests/*"
+FILES_${PN}-dbg += "${datadir}/uhd/examples/.debug/*"
+FILES_${PN}-dbg += "${datadir}/uhd/utils/.debug/*"
+FILES_${PN}-dbg += "${datadir}/uhd/tests/.debug/*"
+FILES_${PN}-examples = "${datadir}/uhd/examples/*"
+
+OECMAKE_BUILDPATH = "${S}/build"
+OECMAKE_SOURCEPATH = "${S}"
+
+EXTRA_OECMAKE = "-DENABLE_USRP_E100=TRUE"
+
+EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
new file mode 100644
index 000000000..d1c936d00
--- /dev/null
+++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
@@ -0,0 +1,8 @@
+require uhd.inc
+
+PR = "${INC_PR}.2"
+
+SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git"
+S = "${WORKDIR}/git/host"
+
+SRCREV = "cc639e876f326e958dace8438ae41b8cd9563780"
diff --git a/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch b/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch
index a38e3db0d..a38e3db0d 100644
--- a/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch
+++ b/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch
diff --git a/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch b/meta-oe/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
index 5e25d1227..5e25d1227 100644
--- a/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
+++ b/meta-oe/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
diff --git a/recipes-core/dbus/dbus-c++-native_git.bb b/meta-oe/recipes-core/dbus/dbus-c++-native_git.bb
index eba80b2e9..eba80b2e9 100644
--- a/recipes-core/dbus/dbus-c++-native_git.bb
+++ b/meta-oe/recipes-core/dbus/dbus-c++-native_git.bb
diff --git a/recipes-core/dbus/dbus-c++/fix-linking.patch b/meta-oe/recipes-core/dbus/dbus-c++/fix-linking.patch
index 822216916..822216916 100644
--- a/recipes-core/dbus/dbus-c++/fix-linking.patch
+++ b/meta-oe/recipes-core/dbus/dbus-c++/fix-linking.patch
diff --git a/recipes-core/dbus/dbus-c++_git.bb b/meta-oe/recipes-core/dbus/dbus-c++_git.bb
index 64598238d..64598238d 100644
--- a/recipes-core/dbus/dbus-c++_git.bb
+++ b/meta-oe/recipes-core/dbus/dbus-c++_git.bb
diff --git a/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
index 32ed7dbfd..32ed7dbfd 100644
--- a/recipes-core/dbus/dbus-daemon-proxy_git.bb
+++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
diff --git a/recipes-core/dbus/dbus.inc b/meta-oe/recipes-core/dbus/dbus.inc
index 40a670aac..40a670aac 100644
--- a/recipes-core/dbus/dbus.inc
+++ b/meta-oe/recipes-core/dbus/dbus.inc
diff --git a/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch b/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch
index 9cca38ddc..9cca38ddc 100644
--- a/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch
+++ b/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch
diff --git a/recipes-core/dbus/dbus/anon.patch b/meta-oe/recipes-core/dbus/dbus/anon.patch
index c9bf7bfa6..c9bf7bfa6 100644
--- a/recipes-core/dbus/dbus/anon.patch
+++ b/meta-oe/recipes-core/dbus/dbus/anon.patch
diff --git a/recipes-core/dbus/dbus/dbus-1.init b/meta-oe/recipes-core/dbus/dbus/dbus-1.init
index a70e7a237..a70e7a237 100644
--- a/recipes-core/dbus/dbus/dbus-1.init
+++ b/meta-oe/recipes-core/dbus/dbus/dbus-1.init
diff --git a/recipes-core/dbus/dbus/reuseaddr01.patch b/meta-oe/recipes-core/dbus/dbus/reuseaddr01.patch
index e291bb894..e291bb894 100644
--- a/recipes-core/dbus/dbus/reuseaddr01.patch
+++ b/meta-oe/recipes-core/dbus/dbus/reuseaddr01.patch
diff --git a/recipes-core/dbus/dbus/reuseaddr02.patch b/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch
index 10bc7edfd..10bc7edfd 100644
--- a/recipes-core/dbus/dbus/reuseaddr02.patch
+++ b/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch
diff --git a/recipes-core/dbus/dbus/tmpdir.patch b/meta-oe/recipes-core/dbus/dbus/tmpdir.patch
index 838b903f0..838b903f0 100644
--- a/recipes-core/dbus/dbus/tmpdir.patch
+++ b/meta-oe/recipes-core/dbus/dbus/tmpdir.patch
diff --git a/recipes-core/dbus/dbus_1.2.24.bb b/meta-oe/recipes-core/dbus/dbus_1.2.24.bb
index 75825514b..75825514b 100644
--- a/recipes-core/dbus/dbus_1.2.24.bb
+++ b/meta-oe/recipes-core/dbus/dbus_1.2.24.bb
diff --git a/recipes-core/dbus/dbus_1.4.0.bb b/meta-oe/recipes-core/dbus/dbus_1.4.0.bb
index 2c4943b4f..2c4943b4f 100644
--- a/recipes-core/dbus/dbus_1.4.0.bb
+++ b/meta-oe/recipes-core/dbus/dbus_1.4.0.bb
diff --git a/recipes-core/fakeroot/fakeroot-native_1.12.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb
index e6add2bb2..e6add2bb2 100644
--- a/recipes-core/fakeroot/fakeroot-native_1.12.4.bb
+++ b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb
diff --git a/recipes-core/fakeroot/fakeroot/configure-libtool.patch b/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch
index 46f7df702..46f7df702 100644
--- a/recipes-core/fakeroot/fakeroot/configure-libtool.patch
+++ b/meta-oe/recipes-core/fakeroot/fakeroot/configure-libtool.patch
diff --git a/recipes-core/fakeroot/fakeroot/fix-prefix.patch b/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch
index 3c47bd765..3c47bd765 100644
--- a/recipes-core/fakeroot/fakeroot/fix-prefix.patch
+++ b/meta-oe/recipes-core/fakeroot/fakeroot/fix-prefix.patch
diff --git a/recipes-core/fakeroot/fakeroot_1.12.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb
index c265749f6..c265749f6 100644
--- a/recipes-core/fakeroot/fakeroot_1.12.4.bb
+++ b/meta-oe/recipes-core/fakeroot/fakeroot_1.12.4.bb
diff --git a/recipes-core/udev/udev-165/akita/default b/meta-oe/recipes-core/udev/udev-165/akita/default
index d0050b873..d0050b873 100644
--- a/recipes-core/udev/udev-165/akita/default
+++ b/meta-oe/recipes-core/udev/udev-165/akita/default
diff --git a/recipes-core/udev/udev-165/bug/10-mx31.rules b/meta-oe/recipes-core/udev/udev-165/bug/10-mx31.rules
index de427fc8b..de427fc8b 100644
--- a/recipes-core/udev/udev-165/bug/10-mx31.rules
+++ b/meta-oe/recipes-core/udev/udev-165/bug/10-mx31.rules
diff --git a/recipes-core/udev/udev-165/bug/30-BUG.rules b/meta-oe/recipes-core/udev/udev-165/bug/30-BUG.rules
index 06faa6bb9..06faa6bb9 100644
--- a/recipes-core/udev/udev-165/bug/30-BUG.rules
+++ b/meta-oe/recipes-core/udev/udev-165/bug/30-BUG.rules
diff --git a/recipes-core/udev/udev-165/bug/bmi_eventpipe.sh b/meta-oe/recipes-core/udev/udev-165/bug/bmi_eventpipe.sh
index acbae5611..acbae5611 100644
--- a/recipes-core/udev/udev-165/bug/bmi_eventpipe.sh
+++ b/meta-oe/recipes-core/udev/udev-165/bug/bmi_eventpipe.sh
diff --git a/recipes-core/udev/udev-165/c7x0/default b/meta-oe/recipes-core/udev/udev-165/c7x0/default
index d0050b873..d0050b873 100644
--- a/recipes-core/udev/udev-165/c7x0/default
+++ b/meta-oe/recipes-core/udev/udev-165/c7x0/default
diff --git a/recipes-core/udev/udev-165/cache b/meta-oe/recipes-core/udev/udev-165/cache
index c0d400b44..c0d400b44 100644
--- a/recipes-core/udev/udev-165/cache
+++ b/meta-oe/recipes-core/udev/udev-165/cache
diff --git a/recipes-core/udev/udev-165/default b/meta-oe/recipes-core/udev/udev-165/default
index 5c4937a9a..5c4937a9a 100644
--- a/recipes-core/udev/udev-165/default
+++ b/meta-oe/recipes-core/udev/udev-165/default
diff --git a/recipes-core/udev/udev-165/init b/meta-oe/recipes-core/udev/udev-165/init
index 7ec32afd0..7ec32afd0 100644
--- a/recipes-core/udev/udev-165/init
+++ b/meta-oe/recipes-core/udev/udev-165/init
diff --git a/recipes-core/udev/udev-165/local.rules b/meta-oe/recipes-core/udev/udev-165/local.rules
index da4b38593..da4b38593 100644
--- a/recipes-core/udev/udev-165/local.rules
+++ b/meta-oe/recipes-core/udev/udev-165/local.rules
diff --git a/recipes-core/udev/udev-165/omap3-pandora/local.rules b/meta-oe/recipes-core/udev/udev-165/omap3-pandora/local.rules
index e433cf959..e433cf959 100644
--- a/recipes-core/udev/udev-165/omap3-pandora/local.rules
+++ b/meta-oe/recipes-core/udev/udev-165/omap3-pandora/local.rules
diff --git a/recipes-core/udev/udev-165/permissions.rules b/meta-oe/recipes-core/udev/udev-165/permissions.rules
index f4f94a6db..f4f94a6db 100644
--- a/recipes-core/udev/udev-165/permissions.rules
+++ b/meta-oe/recipes-core/udev/udev-165/permissions.rules
diff --git a/recipes-core/udev/udev-165/run.rules b/meta-oe/recipes-core/udev/udev-165/run.rules
index 75d71375b..75d71375b 100644
--- a/recipes-core/udev/udev-165/run.rules
+++ b/meta-oe/recipes-core/udev/udev-165/run.rules
diff --git a/recipes-core/udev/udev-165/spitz/default b/meta-oe/recipes-core/udev/udev-165/spitz/default
index d0050b873..d0050b873 100644
--- a/recipes-core/udev/udev-165/spitz/default
+++ b/meta-oe/recipes-core/udev/udev-165/spitz/default
diff --git a/recipes-core/udev/udev-165/tosa/default b/meta-oe/recipes-core/udev/udev-165/tosa/default
index d0050b873..d0050b873 100644
--- a/recipes-core/udev/udev-165/tosa/default
+++ b/meta-oe/recipes-core/udev/udev-165/tosa/default
diff --git a/recipes-core/udev/udev-165/udev-replace-le16toh.patch b/meta-oe/recipes-core/udev/udev-165/udev-replace-le16toh.patch
index 7776c9a10..7776c9a10 100644
--- a/recipes-core/udev/udev-165/udev-replace-le16toh.patch
+++ b/meta-oe/recipes-core/udev/udev-165/udev-replace-le16toh.patch
diff --git a/recipes-core/udev/udev-165/udev-replace-lutimes.patch b/meta-oe/recipes-core/udev/udev-165/udev-replace-lutimes.patch
index dd7789734..dd7789734 100644
--- a/recipes-core/udev/udev-165/udev-replace-lutimes.patch
+++ b/meta-oe/recipes-core/udev/udev-165/udev-replace-lutimes.patch
diff --git a/recipes-core/udev/udev-165/udev.rules b/meta-oe/recipes-core/udev/udev-165/udev.rules
index c20cdcc15..c20cdcc15 100644
--- a/recipes-core/udev/udev-165/udev.rules
+++ b/meta-oe/recipes-core/udev/udev-165/udev.rules
diff --git a/recipes-core/udev/udev.inc b/meta-oe/recipes-core/udev/udev.inc
index 0c8a66229..0c8a66229 100644
--- a/recipes-core/udev/udev.inc
+++ b/meta-oe/recipes-core/udev/udev.inc
diff --git a/recipes-core/udev/udev/50-hostap_cs.rules b/meta-oe/recipes-core/udev/udev/50-hostap_cs.rules
index efefdc58f..efefdc58f 100644
--- a/recipes-core/udev/udev/50-hostap_cs.rules
+++ b/meta-oe/recipes-core/udev/udev/50-hostap_cs.rules
diff --git a/recipes-core/udev/udev/akita/mount.blacklist b/meta-oe/recipes-core/udev/udev/akita/mount.blacklist
index 7e351bc98..7e351bc98 100644
--- a/recipes-core/udev/udev/akita/mount.blacklist
+++ b/meta-oe/recipes-core/udev/udev/akita/mount.blacklist
diff --git a/recipes-core/udev/udev/angstrom/mount.sh b/meta-oe/recipes-core/udev/udev/angstrom/mount.sh
index 81bcfba5e..81bcfba5e 100644
--- a/recipes-core/udev/udev/angstrom/mount.sh
+++ b/meta-oe/recipes-core/udev/udev/angstrom/mount.sh
diff --git a/recipes-core/udev/udev/c7x0/mount.blacklist b/meta-oe/recipes-core/udev/udev/c7x0/mount.blacklist
index 7e351bc98..7e351bc98 100644
--- a/recipes-core/udev/udev/c7x0/mount.blacklist
+++ b/meta-oe/recipes-core/udev/udev/c7x0/mount.blacklist
diff --git a/recipes-core/udev/udev/devfs-udev.rules b/meta-oe/recipes-core/udev/udev/devfs-udev.rules
index 0ba1ad4e7..0ba1ad4e7 100644
--- a/recipes-core/udev/udev/devfs-udev.rules
+++ b/meta-oe/recipes-core/udev/udev/devfs-udev.rules
diff --git a/recipes-core/udev/udev/init b/meta-oe/recipes-core/udev/udev/init
index a13b9afcd..a13b9afcd 100755
--- a/recipes-core/udev/udev/init
+++ b/meta-oe/recipes-core/udev/udev/init
diff --git a/recipes-core/udev/udev/links.conf b/meta-oe/recipes-core/udev/udev/links.conf
index a9f8b58b2..a9f8b58b2 100644
--- a/recipes-core/udev/udev/links.conf
+++ b/meta-oe/recipes-core/udev/udev/links.conf
diff --git a/recipes-core/udev/udev/local.rules b/meta-oe/recipes-core/udev/udev/local.rules
index 5f2efbeb0..5f2efbeb0 100644
--- a/recipes-core/udev/udev/local.rules
+++ b/meta-oe/recipes-core/udev/udev/local.rules
diff --git a/recipes-core/udev/udev/mount.blacklist b/meta-oe/recipes-core/udev/udev/mount.blacklist
index d3ebb1717..d3ebb1717 100644
--- a/recipes-core/udev/udev/mount.blacklist
+++ b/meta-oe/recipes-core/udev/udev/mount.blacklist
diff --git a/recipes-core/udev/udev/mount.sh b/meta-oe/recipes-core/udev/udev/mount.sh
index 440dcee57..440dcee57 100644
--- a/recipes-core/udev/udev/mount.sh
+++ b/meta-oe/recipes-core/udev/udev/mount.sh
diff --git a/recipes-core/udev/udev/network.sh b/meta-oe/recipes-core/udev/udev/network.sh
index 182c26d86..182c26d86 100644
--- a/recipes-core/udev/udev/network.sh
+++ b/meta-oe/recipes-core/udev/udev/network.sh
diff --git a/recipes-core/udev/udev/noasmlinkage.patch b/meta-oe/recipes-core/udev/udev/noasmlinkage.patch
index 0d8e854c0..0d8e854c0 100644
--- a/recipes-core/udev/udev/noasmlinkage.patch
+++ b/meta-oe/recipes-core/udev/udev/noasmlinkage.patch
diff --git a/recipes-core/udev/udev/nokia900/10-cmt_speech.rules b/meta-oe/recipes-core/udev/udev/nokia900/10-cmt_speech.rules
index 25f46efea..25f46efea 100644
--- a/recipes-core/udev/udev/nokia900/10-cmt_speech.rules
+++ b/meta-oe/recipes-core/udev/udev/nokia900/10-cmt_speech.rules
diff --git a/recipes-core/udev/udev/nokia900/70-persistent-net.rules b/meta-oe/recipes-core/udev/udev/nokia900/70-persistent-net.rules
index b68f47c5f..b68f47c5f 100644
--- a/recipes-core/udev/udev/nokia900/70-persistent-net.rules
+++ b/meta-oe/recipes-core/udev/udev/nokia900/70-persistent-net.rules
diff --git a/recipes-core/udev/udev/nokia900/nokia-n900-mac-hack.sh b/meta-oe/recipes-core/udev/udev/nokia900/nokia-n900-mac-hack.sh
index c0b8251ae..c0b8251ae 100644
--- a/recipes-core/udev/udev/nokia900/nokia-n900-mac-hack.sh
+++ b/meta-oe/recipes-core/udev/udev/nokia900/nokia-n900-mac-hack.sh
diff --git a/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-hacks.rules b/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-hacks.rules
index fa2ddb809..fa2ddb809 100644
--- a/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-hacks.rules
+++ b/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-hacks.rules
diff --git a/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-snd.rules b/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-snd.rules
index 413c1656f..413c1656f 100644
--- a/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-snd.rules
+++ b/meta-oe/recipes-core/udev/udev/nokia900/udev-rules-nokia-n900-snd.rules
diff --git a/recipes-core/udev/udev/omap3-pandora/local.rules b/meta-oe/recipes-core/udev/udev/omap3-pandora/local.rules
index 266c3ff85..266c3ff85 100644
--- a/recipes-core/udev/udev/omap3-pandora/local.rules
+++ b/meta-oe/recipes-core/udev/udev/omap3-pandora/local.rules
diff --git a/recipes-core/udev/udev/permissions.rules b/meta-oe/recipes-core/udev/udev/permissions.rules
index efbe568a2..efbe568a2 100644
--- a/recipes-core/udev/udev/permissions.rules
+++ b/meta-oe/recipes-core/udev/udev/permissions.rules
diff --git a/recipes-core/udev/udev/shr/mount.blacklist b/meta-oe/recipes-core/udev/udev/shr/mount.blacklist
index 117ac9b86..117ac9b86 100644
--- a/recipes-core/udev/udev/shr/mount.blacklist
+++ b/meta-oe/recipes-core/udev/udev/shr/mount.blacklist
diff --git a/recipes-core/udev/udev/slugos/mount.blacklist b/meta-oe/recipes-core/udev/udev/slugos/mount.blacklist
index d9da5cfd7..d9da5cfd7 100644
--- a/recipes-core/udev/udev/slugos/mount.blacklist
+++ b/meta-oe/recipes-core/udev/udev/slugos/mount.blacklist
diff --git a/recipes-core/udev/udev/slugos/mount.sh b/meta-oe/recipes-core/udev/udev/slugos/mount.sh
index b5298e97a..b5298e97a 100644
--- a/recipes-core/udev/udev/slugos/mount.sh
+++ b/meta-oe/recipes-core/udev/udev/slugos/mount.sh
diff --git a/recipes-core/udev/udev/spitz/mount.blacklist b/meta-oe/recipes-core/udev/udev/spitz/mount.blacklist
index 38c7aa4b3..38c7aa4b3 100644
--- a/recipes-core/udev/udev/spitz/mount.blacklist
+++ b/meta-oe/recipes-core/udev/udev/spitz/mount.blacklist
diff --git a/recipes-core/udev/udev/tosa/mount.blacklist b/meta-oe/recipes-core/udev/udev/tosa/mount.blacklist
index 7e351bc98..7e351bc98 100644
--- a/recipes-core/udev/udev/tosa/mount.blacklist
+++ b/meta-oe/recipes-core/udev/udev/tosa/mount.blacklist
diff --git a/recipes-core/udev/udev/udev-compat-wrapper-patch b/meta-oe/recipes-core/udev/udev/udev-compat-wrapper-patch
index c90d05aef..c90d05aef 100644
--- a/recipes-core/udev/udev/udev-compat-wrapper-patch
+++ b/meta-oe/recipes-core/udev/udev/udev-compat-wrapper-patch
diff --git a/recipes-core/udev/udev/udev.rules b/meta-oe/recipes-core/udev/udev/udev.rules
index 5c566f6ce..5c566f6ce 100644
--- a/recipes-core/udev/udev/udev.rules
+++ b/meta-oe/recipes-core/udev/udev/udev.rules
diff --git a/recipes-core/udev/udev/udev_network_queue.sh b/meta-oe/recipes-core/udev/udev/udev_network_queue.sh
index 05e08e9d1..05e08e9d1 100644
--- a/recipes-core/udev/udev/udev_network_queue.sh
+++ b/meta-oe/recipes-core/udev/udev/udev_network_queue.sh
diff --git a/recipes-core/udev/udev/udevsynthesize.patch b/meta-oe/recipes-core/udev/udev/udevsynthesize.patch
index 781118848..781118848 100644
--- a/recipes-core/udev/udev/udevsynthesize.patch
+++ b/meta-oe/recipes-core/udev/udev/udevsynthesize.patch
diff --git a/recipes-core/udev/udev/udevsynthesize.sh b/meta-oe/recipes-core/udev/udev/udevsynthesize.sh
index d58217c14..d58217c14 100644
--- a/recipes-core/udev/udev/udevsynthesize.sh
+++ b/meta-oe/recipes-core/udev/udev/udevsynthesize.sh
diff --git a/recipes-core/udev/udev_165.bb b/meta-oe/recipes-core/udev/udev_165.bb
index 2c4171d65..2c4171d65 100644
--- a/recipes-core/udev/udev_165.bb
+++ b/meta-oe/recipes-core/udev/udev_165.bb
diff --git a/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
index 2623301da..2623301da 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
index dfe9b18e1..dfe9b18e1 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.16.1-e300c2c3.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch
index adcabb4f6..adcabb4f6 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-2.19.1-ld-sysroot.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch
index c71f0ad4d..c71f0ad4d 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-mips-pie.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch
index c2f19276f..c2f19276f 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch
index 8de04e0fe..8de04e0fe 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-100-uclibc-conf.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch
index 04a7e61e2..04a7e61e2 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-001_ld_makefile_patch.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-006_better_file_error.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-300-012_check_ldrunpath_length.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch
index db838cf20..db838cf20 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-uclibc-gas-needs-libm.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch
index 4cd9e2243..4cd9e2243 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/binutils-x86_64_i386_biarch.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch
index 36a14d7a1..36a14d7a1 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/libiberty_path_fix.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/libtool-2.4-update.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/libtool-2.4-update.patch
index f3a9203cd..f3a9203cd 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/libtool-2.4-update.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/libtool-2.4-update.patch
diff --git a/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch
index a0058c1a4..a0058c1a4 100644
--- a/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch
+++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch
diff --git a/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta-oe/recipes-devtools/binutils/binutils-cross-canadian.inc
index 95e535a1b..95e535a1b 100644
--- a/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta-oe/recipes-devtools/binutils/binutils-cross-canadian.inc
diff --git a/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb b/meta-oe/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
index 1621b77e9..1621b77e9 100644
--- a/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
+++ b/meta-oe/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb
diff --git a/recipes-devtools/binutils/binutils-cross.inc b/meta-oe/recipes-devtools/binutils/binutils-cross.inc
index 4b909720d..4b909720d 100644
--- a/recipes-devtools/binutils/binutils-cross.inc
+++ b/meta-oe/recipes-devtools/binutils/binutils-cross.inc
diff --git a/recipes-devtools/binutils/binutils-cross_2.20.1.bb b/meta-oe/recipes-devtools/binutils/binutils-cross_2.20.1.bb
index 8c7e4bc1a..8c7e4bc1a 100644
--- a/recipes-devtools/binutils/binutils-cross_2.20.1.bb
+++ b/meta-oe/recipes-devtools/binutils/binutils-cross_2.20.1.bb
diff --git a/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb b/meta-oe/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb
index 88627f87b..88627f87b 100644
--- a/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb
+++ b/meta-oe/recipes-devtools/binutils/binutils-crosssdk_2.20.1.bb
diff --git a/recipes-devtools/binutils/binutils.inc b/meta-oe/recipes-devtools/binutils/binutils.inc
index d9e859ef2..d9e859ef2 100644
--- a/recipes-devtools/binutils/binutils.inc
+++ b/meta-oe/recipes-devtools/binutils/binutils.inc
diff --git a/recipes-devtools/binutils/binutils_2.20.1.bb b/meta-oe/recipes-devtools/binutils/binutils_2.20.1.bb
index 6961a46f7..6961a46f7 100644
--- a/recipes-devtools/binutils/binutils_2.20.1.bb
+++ b/meta-oe/recipes-devtools/binutils/binutils_2.20.1.bb
diff --git a/meta-oe/recipes-devtools/cppunit/cppunit_1.12.1.bb b/meta-oe/recipes-devtools/cppunit/cppunit_1.12.1.bb
new file mode 100644
index 000000000..738b5df63
--- /dev/null
+++ b/meta-oe/recipes-devtools/cppunit/cppunit_1.12.1.bb
@@ -0,0 +1,19 @@
+# cppunit OE build file
+# Copyright (C) 2005, Koninklijke Philips Electronics NV.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "Unit Testing Library for C++"
+HOMEPAGE = "http://cppunit.sourceforge.net/"
+LICENSE = "LGPL"
+SECTION = "devel"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/cppunit/cppunit-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+CXXFLAGS_powerpc += "-lstdc++"
+
+
+SRC_URI[md5sum] = "bd30e9cf5523cdfc019b94f5e1d7fd19"
+SRC_URI[sha256sum] = "ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a"
diff --git a/recipes-devtools/gcc/files/canadian-build-modules-configure.patch b/meta-oe/recipes-devtools/gcc/files/canadian-build-modules-configure.patch
index 8aede105c..8aede105c 100644
--- a/recipes-devtools/gcc/files/canadian-build-modules-configure.patch
+++ b/meta-oe/recipes-devtools/gcc/files/canadian-build-modules-configure.patch
diff --git a/recipes-devtools/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch b/meta-oe/recipes-devtools/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
index 8a2a4c404..8a2a4c404 100644
--- a/recipes-devtools/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
+++ b/meta-oe/recipes-devtools/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
diff --git a/recipes-devtools/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch b/meta-oe/recipes-devtools/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch
index b3753364f..b3753364f 100644
--- a/recipes-devtools/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch
+++ b/meta-oe/recipes-devtools/gcc/files/gcc-4.3.x-fix-EXTRA_BUILD.patch
diff --git a/recipes-devtools/gcc/files/gcc-posix-open-fix.patch b/meta-oe/recipes-devtools/gcc/files/gcc-posix-open-fix.patch
index 99f813e86..99f813e86 100644
--- a/recipes-devtools/gcc/files/gcc-posix-open-fix.patch
+++ b/meta-oe/recipes-devtools/gcc/files/gcc-posix-open-fix.patch
diff --git a/recipes-devtools/gcc/files/gcc4-mtune-compat.patch b/meta-oe/recipes-devtools/gcc/files/gcc4-mtune-compat.patch
index 0da2811d3..0da2811d3 100644
--- a/recipes-devtools/gcc/files/gcc4-mtune-compat.patch
+++ b/meta-oe/recipes-devtools/gcc/files/gcc4-mtune-compat.patch
diff --git a/recipes-devtools/gcc/files/gfortran-4.3.x.patch b/meta-oe/recipes-devtools/gcc/files/gfortran-4.3.x.patch
index 0c42851ce..0c42851ce 100644
--- a/recipes-devtools/gcc/files/gfortran-4.3.x.patch
+++ b/meta-oe/recipes-devtools/gcc/files/gfortran-4.3.x.patch
diff --git a/recipes-devtools/gcc/files/gfortran.patch b/meta-oe/recipes-devtools/gcc/files/gfortran.patch
index 96905e5d7..96905e5d7 100644
--- a/recipes-devtools/gcc/files/gfortran.patch
+++ b/meta-oe/recipes-devtools/gcc/files/gfortran.patch
diff --git a/recipes-devtools/gcc/files/pr22133-mingw-path-fixup.patch b/meta-oe/recipes-devtools/gcc/files/pr22133-mingw-path-fixup.patch
index 429e9ffd0..429e9ffd0 100644
--- a/recipes-devtools/gcc/files/pr22133-mingw-path-fixup.patch
+++ b/meta-oe/recipes-devtools/gcc/files/pr22133-mingw-path-fixup.patch
diff --git a/recipes-devtools/gcc/files/pr33281-mingw-host-fragment.patch b/meta-oe/recipes-devtools/gcc/files/pr33281-mingw-host-fragment.patch
index e16fb4464..e16fb4464 100644
--- a/recipes-devtools/gcc/files/pr33281-mingw-host-fragment.patch
+++ b/meta-oe/recipes-devtools/gcc/files/pr33281-mingw-host-fragment.patch
diff --git a/recipes-devtools/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch b/meta-oe/recipes-devtools/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
index faf44c27f..faf44c27f 100644
--- a/recipes-devtools/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
+++ b/meta-oe/recipes-devtools/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
diff --git a/recipes-devtools/gcc/gcc-4.5.inc b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
index 52fca3701..52fca3701 100644
--- a/recipes-devtools/gcc/gcc-4.5.inc
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc
diff --git a/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch
index 0b799607e..0b799607e 100644
--- a/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/100-uclibc-conf.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch
index 23fce7544..23fce7544 100644
--- a/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/602-sdk-libstdc++-includes.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/64bithack.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/64bithack.patch
index 067676ab6..067676ab6 100644
--- a/recipes-devtools/gcc/gcc-4.5/64bithack.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/64bithack.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch
index d84889259..d84889259 100644
--- a/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/740-sh-pr24836.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch
index 77d02c3ab..77d02c3ab 100644
--- a/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/800-arm-bigendian.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch
index c4641dc63..c4641dc63 100644
--- a/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/904-flatten-switch-stmt-00.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
index 9ae01c3fc..9ae01c3fc 100644
--- a/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch
index 45df47c5b..45df47c5b 100644
--- a/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/Makefile.in.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch
index 39c90e7e7..39c90e7e7 100644
--- a/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/arm-lib1funcs.as-fix-mismatch-between-conditions-of-an-IT-block.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch b/meta-oe/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch
index 7bb888706..7bb888706 100644
--- a/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/arm-unbreak-eabi-armv4t.dpatch
diff --git a/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch
index b889f9b6c..b889f9b6c 100644
--- a/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/cache-amnesia.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch
index b1d5a1a3c..b1d5a1a3c 100644
--- a/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/disable_relax_pic_calls_flag.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch
index a149eae98..a149eae98 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-c++-builtin-redecl.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch
index 00d37bd7c..00d37bd7c 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-cpp-pragma.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch
index a588db28e..a588db28e 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-i386-libgomp.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch
index cad13d122..cad13d122 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ia64-libunwind.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch
index de14a5001..de14a5001 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-debug-iface-type.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch
index 3cb10f3c2..3cb10f3c2 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-java-nomulti.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch
index da85e556e..da85e556e 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-libgomp-speedup.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch
index 3de4158eb..3de4158eb 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-ppc32-retaddr.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch
index 172bb8117..172bb8117 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr27898.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch
index f35696703..f35696703 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr32139.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch
index 68c30650f..68c30650f 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-pr33763.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch
index e96ae6f13..e96ae6f13 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh251682.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch
index 4888ac47d..4888ac47d 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh330771.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch
index 7e2801b99..7e2801b99 100644
--- a/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fedora/gcc43-rh341221.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch
index 348c77006..348c77006 100644
--- a/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/fortran-cross-compile-hack.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch
index d1df8b271..d1df8b271 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-4.0.2-e300c2c3.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index f33e6c1ea..f33e6c1ea 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2 b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2
index d37a2c032..d37a2c032 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-4.5.0_to_svn_162697.patch.bz2
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch
index d5a31d19d..d5a31d19d 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-arm-volatile-bitfield-fix.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch
index 5d1a033a9..5d1a033a9 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-armv4-pass-fix-v4bx-to-ld.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch
index 51892855a..51892855a 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-flags-for-build.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch
index 84c5ef2eb..84c5ef2eb 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-ice-hack.dpatch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch
index d1712071a..d1712071a 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-poison-dir-extend.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch
index 3cc7cbad4..3cc7cbad4 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-poison-parameters.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch
index 04043ff0b..04043ff0b 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-poison-system-directories.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch
index 61c883e1f..61c883e1f 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-pr43698-arm-rev-instr.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch
index cbe12303e..cbe12303e 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-scalar-widening-pr45847.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch
index 4f94fc9d6..4f94fc9d6 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch
index 5f134ef33..5f134ef33 100644
--- a/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/gcc_revert_base_version_to_4.5.0.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
index ada36a591..ada36a591 100644
--- a/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch b/meta-oe/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch
index 70c9e8154..70c9e8154 100644
--- a/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/libstdc++-pic.dpatch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch
index bff745dae..bff745dae 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99297.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch
index 541134a6b..541134a6b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99298.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99299.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99299.patch
index 7dea4303a..7dea4303a 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99299.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99299.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99300.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99300.patch
index ae417a18f..ae417a18f 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99300.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99300.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch
index 95907eeb8..95907eeb8 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99301.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99302.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99302.patch
index 635d3f8bd..635d3f8bd 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99302.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99302.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99303.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99303.patch
index 53d1d08d5..53d1d08d5 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99303.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99303.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99304.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99304.patch
index ab1296347..ab1296347 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99304.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99304.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99305.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99305.patch
index ed25334df..ed25334df 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99305.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99305.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99306.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99306.patch
index 423cd5652..423cd5652 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99306.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99306.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99307.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99307.patch
index 9c936d4fa..9c936d4fa 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99307.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99307.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99308.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99308.patch
index bf35a2ed4..bf35a2ed4 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99308.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99308.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99310.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99310.patch
index da95fba79..da95fba79 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99310.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99310.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99312.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99312.patch
index 9f0c98e9c..9f0c98e9c 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99312.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99312.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99313.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99313.patch
index eadce6ec6..eadce6ec6 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99313.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99313.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99314.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99314.patch
index 216fcac72..216fcac72 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99314.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99314.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99315.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99315.patch
index 3d5dd5f9a..3d5dd5f9a 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99315.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99315.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99316.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99316.patch
index c7f92b6fc..c7f92b6fc 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99316.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99316.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99318.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99318.patch
index ad4943a0a..ad4943a0a 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99318.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99318.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99319.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99319.patch
index a649c9542..a649c9542 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99319.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99319.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99320.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99320.patch
index 669523218..669523218 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99320.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99320.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99321.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99321.patch
index b122ab10f..b122ab10f 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99321.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99321.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99322.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99322.patch
index 6962c1cec..6962c1cec 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99322.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99322.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99323.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99323.patch
index 38b6fa3f0..38b6fa3f0 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99323.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99323.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99324.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99324.patch
index 40b368862..40b368862 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99324.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99324.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99325.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99325.patch
index 0dbb3dbf7..0dbb3dbf7 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99325.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99325.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99326.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99326.patch
index 59b598ba7..59b598ba7 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99326.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99326.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99327.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99327.patch
index 5d489aab6..5d489aab6 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99327.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99327.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99332.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99332.patch
index 3e6361130..3e6361130 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99332.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99332.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99335.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99335.patch
index f75a74091..f75a74091 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99335.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99335.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99336.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99336.patch
index 9b5656094..9b5656094 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99336.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99336.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99337.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99337.patch
index 850acb31b..850acb31b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99337.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99337.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99338.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99338.patch
index 632e80caf..632e80caf 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99338.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99338.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99339.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99339.patch
index f4a8e80ab..f4a8e80ab 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99339.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99339.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99340.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99340.patch
index 31fa99a2e..31fa99a2e 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99340.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99340.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99341.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99341.patch
index d9073123c..d9073123c 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99341.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99341.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99342.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99342.patch
index 02db2b4e7..02db2b4e7 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99342.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99342.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99343.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99343.patch
index 86b2d8109..86b2d8109 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99343.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99343.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99344.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99344.patch
index d03ee9406..d03ee9406 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99344.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99344.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99345.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99345.patch
index 757e66c8b..757e66c8b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99345.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99345.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99346.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99346.patch
index 480719515..480719515 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99346.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99346.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99347.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99347.patch
index 57b8605e5..57b8605e5 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99347.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99347.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99348.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99348.patch
index f99938a7f..f99938a7f 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99348.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99348.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99349.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99349.patch
index a95b649e4..a95b649e4 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99349.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99349.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch
index 3f66f9d15..3f66f9d15 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99350.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch
index aa3b3eb85..aa3b3eb85 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99351.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch
index 8d48ada2f..8d48ada2f 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99352.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99353.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99353.patch
index 239251d2b..239251d2b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99353.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99353.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99354.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99354.patch
index 743e2751c..743e2751c 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99354.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99354.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99355.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99355.patch
index b47c2ceb4..b47c2ceb4 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99355.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99355.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99356.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99356.patch
index 64efbc759..64efbc759 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99356.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99356.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99357.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99357.patch
index bbdd38b55..bbdd38b55 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99357.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99357.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99358.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99358.patch
index eedcf62d1..eedcf62d1 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99358.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99358.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99359.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99359.patch
index 92dfe0038..92dfe0038 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99359.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99359.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99360.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99360.patch
index a58dd2441..a58dd2441 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99360.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99360.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99361.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99361.patch
index db9e63917..db9e63917 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99361.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99361.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99363.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99363.patch
index 7003cf837..7003cf837 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99363.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99363.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99364.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99364.patch
index 8ae781eca..8ae781eca 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99364.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99364.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99365.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99365.patch
index 36a942118..36a942118 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99365.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99365.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99366.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99366.patch
index 0998c812e..0998c812e 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99366.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99366.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99367.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99367.patch
index 2d572b1bb..2d572b1bb 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99367.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99367.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99368.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99368.patch
index 0705e4183..0705e4183 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99368.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99368.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99369.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99369.patch
index 9bbc02062..9bbc02062 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99369.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99369.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99371.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99371.patch
index be102160c..be102160c 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99371.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99371.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99372.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99372.patch
index 03b478b79..03b478b79 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99372.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99372.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99373.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99373.patch
index 60608e481..60608e481 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99373.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99373.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99374.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99374.patch
index dfe193ff2..dfe193ff2 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99374.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99374.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch
index fac64b964..fac64b964 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99376.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99376.patch
index 5e402a753..5e402a753 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99376.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99376.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99377.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99377.patch
index d51f0874e..d51f0874e 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99377.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99377.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99378.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99378.patch
index aacf19b7c..aacf19b7c 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99378.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99378.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99379.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99379.patch
index e1e89bf8a..e1e89bf8a 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99379.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99379.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99380.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99380.patch
index c66c11f82..c66c11f82 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99380.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99380.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99381.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99381.patch
index c504f44fb..c504f44fb 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99381.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99381.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99383.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99383.patch
index 82a9e93e4..82a9e93e4 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99383.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99383.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99384.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99384.patch
index 89c04a894..89c04a894 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99384.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99384.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99385.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99385.patch
index d10cf3465..d10cf3465 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99385.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99385.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99388.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99388.patch
index f603fcadb..f603fcadb 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99388.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99388.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99391.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99391.patch
index 31122e34b..31122e34b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99391.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99391.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99392.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99392.patch
index 9a9d5940c..9a9d5940c 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99392.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99392.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99393.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99393.patch
index d8df57a44..d8df57a44 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99393.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99393.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99395.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99395.patch
index 809a20aae..809a20aae 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99395.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99395.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99396.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99396.patch
index 655399ab1..655399ab1 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99396.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99396.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99397.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99397.patch
index e795d54e0..e795d54e0 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99397.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99397.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99398.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99398.patch
index c332d50fa..c332d50fa 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99398.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99398.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99402.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99402.patch
index 6627a11d4..6627a11d4 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99402.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99402.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch
index 093dd1c57..093dd1c57 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99404.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99404.patch
index 275330092..275330092 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99404.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99404.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99405.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99405.patch
index 7fc943f4b..7fc943f4b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99405.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99405.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99406.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99406.patch
index 54473fa23..54473fa23 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99406.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99406.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99407.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99407.patch
index 80f4246ed..80f4246ed 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99407.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99407.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99408.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99408.patch
index 1d873ba65..1d873ba65 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99408.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99408.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99409.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99409.patch
index 39c3ab081..39c3ab081 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99409.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99409.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99410.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99410.patch
index f2a1c9562..f2a1c9562 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99410.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99410.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99411.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99411.patch
index c9a931686..c9a931686 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99411.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99411.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99412.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99412.patch
index c0aabbeb5..c0aabbeb5 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99412.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99412.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99413.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99413.patch
index 3f873e7fe..3f873e7fe 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99413.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99413.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99415.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99415.patch
index 3622ac423..3622ac423 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99415.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99415.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99416.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99416.patch
index 72a221b1d..72a221b1d 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99416.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99416.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99417.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99417.patch
index 2ad7e6968..2ad7e6968 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99417.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99417.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99418.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99418.patch
index 3ea7956f0..3ea7956f0 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99418.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99418.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99419.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99419.patch
index cb434082b..cb434082b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99419.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99419.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99420.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99420.patch
index 4e63a8189..4e63a8189 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99420.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99420.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99421.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99421.patch
index 3a45ee502..3a45ee502 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99421.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99421.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99423.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99423.patch
index 80dbe3f71..80dbe3f71 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99423.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99423.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99424.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99424.patch
index b6c653266..b6c653266 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99424.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99424.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99425.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99425.patch
index 17839c03d..17839c03d 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99425.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99425.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99426.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99426.patch
index cf06e1ff7..cf06e1ff7 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99426.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99426.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99429.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99429.patch
index 63ba95e0e..63ba95e0e 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99429.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99429.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99432.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99432.patch
index b63c9b35e..b63c9b35e 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99432.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99432.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99433.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99433.patch
index 6bc33f2be..6bc33f2be 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99433.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99433.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99434.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99434.patch
index adda68c62..adda68c62 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99434.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99434.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99435.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99435.patch
index d66df137f..d66df137f 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99435.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99435.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99436.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99436.patch
index deb749efc..deb749efc 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99436.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99436.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99437.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99437.patch
index 94d966608..94d966608 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99437.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99437.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99439.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99439.patch
index cec7f57d4..cec7f57d4 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99439.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99439.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99440.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99440.patch
index b7a28de65..b7a28de65 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99440.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99440.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99441.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99441.patch
index 5495b8d80..5495b8d80 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99441.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99441.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99442.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99442.patch
index 62c44784b..62c44784b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99442.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99442.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99443.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99443.patch
index 802c3816f..802c3816f 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99443.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99443.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99444.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99444.patch
index 80eebeec0..80eebeec0 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99444.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99444.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99449.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99449.patch
index e6b0fad08..e6b0fad08 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99449.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99449.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99450.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99450.patch
index 49fa07fca..49fa07fca 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99450.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99450.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99451.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99451.patch
index d87c312d0..d87c312d0 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99451.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99451.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99452.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99452.patch
index 6cfc01fef..6cfc01fef 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99452.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99452.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99453.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99453.patch
index 8eb35325e..8eb35325e 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99453.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99453.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99454.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99454.patch
index 8aa06cc51..8aa06cc51 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99454.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99454.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99455.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99455.patch
index 5e8383a7d..5e8383a7d 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99455.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99455.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99456.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99456.patch
index 35f98d24a..35f98d24a 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99456.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99456.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99457.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99457.patch
index 47b897d5e..47b897d5e 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99457.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99457.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99464.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99464.patch
index e8c8e6388..e8c8e6388 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99464.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99464.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99465.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99465.patch
index 32c2999a7..32c2999a7 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99465.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99465.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99466.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99466.patch
index 580d4f472..580d4f472 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99466.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99466.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99468.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99468.patch
index cf22aaf16..cf22aaf16 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99468.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99468.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99473.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99473.patch
index 3ac7f7f6f..3ac7f7f6f 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99473.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99473.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99474.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99474.patch
index 9b0fb0b48..9b0fb0b48 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99474.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99474.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99475.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99475.patch
index aa9d6aa36..aa9d6aa36 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99475.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99475.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch
index 38463a9b4..38463a9b4 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99478.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch
index 2920466d8..2920466d8 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99479.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch
index 76d3c9565..76d3c9565 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99480.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch
index db53255de..db53255de 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99481.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch
index 334ac4ec1..334ac4ec1 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99482.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch
index c0be4a03b..c0be4a03b 100644
--- a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99483.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/mips64-nomultilib.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/mips64-nomultilib.patch
index 1ef69f899..1ef69f899 100644
--- a/recipes-devtools/gcc/gcc-4.5/mips64-nomultilib.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/mips64-nomultilib.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/more-epilogues.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/more-epilogues.patch
index 64f1cf375..64f1cf375 100644
--- a/recipes-devtools/gcc/gcc-4.5/more-epilogues.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/more-epilogues.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/optional_libstdc.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/optional_libstdc.patch
index 0f74353a1..0f74353a1 100644
--- a/recipes-devtools/gcc/gcc-4.5/optional_libstdc.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/optional_libstdc.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/pr30961.dpatch b/meta-oe/recipes-devtools/gcc/gcc-4.5/pr30961.dpatch
index b20fdf5bf..b20fdf5bf 100644
--- a/recipes-devtools/gcc/gcc-4.5/pr30961.dpatch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/pr30961.dpatch
diff --git a/recipes-devtools/gcc/gcc-4.5/pr35942.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/pr35942.patch
index da610f518..da610f518 100644
--- a/recipes-devtools/gcc/gcc-4.5/pr35942.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/pr35942.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/sh4-multilib.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/sh4-multilib.patch
index c895c95e1..c895c95e1 100644
--- a/recipes-devtools/gcc/gcc-4.5/sh4-multilib.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/sh4-multilib.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/zecke-no-host-includes.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/zecke-no-host-includes.patch
index 4ccf35f62..4ccf35f62 100644
--- a/recipes-devtools/gcc/gcc-4.5/zecke-no-host-includes.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/zecke-no-host-includes.patch
diff --git a/recipes-devtools/gcc/gcc-4.5/zecke-xgcc-cpp.patch b/meta-oe/recipes-devtools/gcc/gcc-4.5/zecke-xgcc-cpp.patch
index a7722cbfc..a7722cbfc 100644
--- a/recipes-devtools/gcc/gcc-4.5/zecke-xgcc-cpp.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.5/zecke-xgcc-cpp.patch
diff --git a/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb
index 288bd3343..288bd3343 100644
--- a/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross-canadian_4.5.bb
diff --git a/recipes-devtools/gcc/gcc-cross-initial_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb
index 3e67036bf..3e67036bf 100644
--- a/recipes-devtools/gcc/gcc-cross-initial_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb
diff --git a/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb
index 8210483e7..8210483e7 100644
--- a/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross-intermediate_4.5.bb
diff --git a/recipes-devtools/gcc/gcc-cross_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-cross_4.5.bb
index 0f810b71a..0f810b71a 100644
--- a/recipes-devtools/gcc/gcc-cross_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-cross_4.5.bb
diff --git a/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb
index 7ebb27338..7ebb27338 100644
--- a/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.bb
diff --git a/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb
index aa5b5a845..aa5b5a845 100644
--- a/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.bb
diff --git a/recipes-devtools/gcc/gcc-crosssdk_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-crosssdk_4.5.bb
index b8e3aed66..b8e3aed66 100644
--- a/recipes-devtools/gcc/gcc-crosssdk_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-crosssdk_4.5.bb
diff --git a/recipes-devtools/gcc/gcc-runtime_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb
index bfc5ce564..bfc5ce564 100644
--- a/recipes-devtools/gcc/gcc-runtime_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb
diff --git a/recipes-devtools/gcc/gcc_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc_4.5.bb
index 31fcac0a7..31fcac0a7 100644
--- a/recipes-devtools/gcc/gcc_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/gcc_4.5.bb
diff --git a/recipes-devtools/gcc/libgcc_4.5.bb b/meta-oe/recipes-devtools/gcc/libgcc_4.5.bb
index 309dcb12c..309dcb12c 100644
--- a/recipes-devtools/gcc/libgcc_4.5.bb
+++ b/meta-oe/recipes-devtools/gcc/libgcc_4.5.bb
diff --git a/meta-oe/recipes-devtools/python/python-cheetah_2.4.4.bb b/meta-oe/recipes-devtools/python/python-cheetah_2.4.4.bb
new file mode 100644
index 000000000..e3ecb1c08
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-cheetah_2.4.4.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Python template engine and code generation tool"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"
+SRCNAME = "Cheetah"
+PR = "r1"
+
+SRC_URI = "http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+RDEPENDS_${PN} = "python-pickle python-pprint"
+
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "853917116e731afbc8c8a43c37e6ddba"
+SRC_URI[sha256sum] = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"
diff --git a/recipes-devtools/python/python-numpy/arm/config.h b/meta-oe/recipes-devtools/python/python-numpy/arm/config.h
index 17ef186d5..17ef186d5 100644
--- a/recipes-devtools/python/python-numpy/arm/config.h
+++ b/meta-oe/recipes-devtools/python/python-numpy/arm/config.h
diff --git a/recipes-devtools/python/python-numpy/arm/numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/arm/numpyconfig.h
index c4bf6547f..c4bf6547f 100644
--- a/recipes-devtools/python/python-numpy/arm/numpyconfig.h
+++ b/meta-oe/recipes-devtools/python/python-numpy/arm/numpyconfig.h
diff --git a/recipes-devtools/python/python-numpy/mipsel/config.h b/meta-oe/recipes-devtools/python/python-numpy/mipsel/config.h
index 17ef186d5..17ef186d5 100644
--- a/recipes-devtools/python/python-numpy/mipsel/config.h
+++ b/meta-oe/recipes-devtools/python/python-numpy/mipsel/config.h
diff --git a/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h b/meta-oe/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
index c4bf6547f..c4bf6547f 100644
--- a/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
+++ b/meta-oe/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
diff --git a/recipes-devtools/python/python-numpy/trycompile.diff b/meta-oe/recipes-devtools/python/python-numpy/trycompile.diff
index 3ab3d72f2..3ab3d72f2 100644
--- a/recipes-devtools/python/python-numpy/trycompile.diff
+++ b/meta-oe/recipes-devtools/python/python-numpy/trycompile.diff
diff --git a/recipes-devtools/python/python-numpy/unbreak-assumptions.diff b/meta-oe/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
index c5b448167..c5b448167 100644
--- a/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
+++ b/meta-oe/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
diff --git a/recipes-devtools/python/python-numpy_1.4.1.bb b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
index ed47f47db..ed47f47db 100644
--- a/recipes-devtools/python/python-numpy_1.4.1.bb
+++ b/meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb
diff --git a/recipes-devtools/python/python-setuptools_0.6c11.bb b/meta-oe/recipes-devtools/python/python-setuptools_0.6c11.bb
index 6b17a41f7..6b17a41f7 100644
--- a/recipes-devtools/python/python-setuptools_0.6c11.bb
+++ b/meta-oe/recipes-devtools/python/python-setuptools_0.6c11.bb
diff --git a/meta-oe/recipes-devtools/swig/swig.inc b/meta-oe/recipes-devtools/swig/swig.inc
new file mode 100644
index 000000000..0603d1cfe
--- /dev/null
+++ b/meta-oe/recipes-devtools/swig/swig.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
+HOMEPAGE = "http://swig.sourceforge.net/"
+LICENSE = "BSD"
+SECTION = "devel"
+INC_PR = "r1"
+
+DEPENDS = "python"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
+
+do_configure() {
+        oe_runconf
+}
+
diff --git a/meta-oe/recipes-devtools/swig/swig_1.3.31.bb b/meta-oe/recipes-devtools/swig/swig_1.3.31.bb
new file mode 100644
index 000000000..8a601350a
--- /dev/null
+++ b/meta-oe/recipes-devtools/swig/swig_1.3.31.bb
@@ -0,0 +1,7 @@
+require swig.inc
+
+PR = "${INC_PR}.0"
+
+
+SRC_URI[md5sum] = "4a0bae63e3713e89b26db7209b6a7e05"
+SRC_URI[sha256sum] = "c2ad63095e34b4a474e7ff4adb6ea8b7ab238bb5738d00a739102bb8bb71d805"
diff --git a/meta-oe/recipes-devtools/swig/swig_1.3.38.bb b/meta-oe/recipes-devtools/swig/swig_1.3.38.bb
new file mode 100644
index 000000000..a2d7ecbca
--- /dev/null
+++ b/meta-oe/recipes-devtools/swig/swig_1.3.38.bb
@@ -0,0 +1,7 @@
+require swig.inc
+
+PR = "${INC_PR}.0"
+
+
+SRC_URI[md5sum] = "650c774917be49c526a4f8a3e733c898"
+SRC_URI[sha256sum] = "e7cbddc8c68b1eccba1c82edd5427595397d9a483c8fb1184abc9303afe08045"
diff --git a/meta-oe/recipes-devtools/swig/swig_1.3.39.bb b/meta-oe/recipes-devtools/swig/swig_1.3.39.bb
new file mode 100644
index 000000000..2db94dae3
--- /dev/null
+++ b/meta-oe/recipes-devtools/swig/swig_1.3.39.bb
@@ -0,0 +1,6 @@
+require swig.inc
+
+PR = "${INC_PR}.1"
+
+SRC_URI[md5sum] = "ac201d1b87f8659584534f9540d7ad24"
+SRC_URI[sha256sum] = "bb2d5d9373cf1fe03faaadb02de47af3b058b0300e0f58ece6a7212f0a2b11dc"
diff --git a/meta-oe/recipes-devtools/swig/swig_2.0.0.bb b/meta-oe/recipes-devtools/swig/swig_2.0.0.bb
new file mode 100644
index 000000000..b443def58
--- /dev/null
+++ b/meta-oe/recipes-devtools/swig/swig_2.0.0.bb
@@ -0,0 +1,7 @@
+require swig.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "36ee2d9974be46a9f0a36460af928eb9"
+SRC_URI[sha256sum] = "2568d042d3c7cfbcb17e2471b0434bd3aa78d7a1829f9ef6f1b9fc522e4754ea"
+
diff --git a/recipes-gnome/gnome/files/acinclude.m4 b/meta-oe/recipes-gnome/gnome/files/acinclude.m4
index 53518fb2e..53518fb2e 100644
--- a/recipes-gnome/gnome/files/acinclude.m4
+++ b/meta-oe/recipes-gnome/gnome/files/acinclude.m4
diff --git a/recipes-gnome/gnome/files/gtk-doc.m4 b/meta-oe/recipes-gnome/gnome/files/gtk-doc.m4
index 3ec41666b..3ec41666b 100644
--- a/recipes-gnome/gnome/files/gtk-doc.m4
+++ b/meta-oe/recipes-gnome/gnome/files/gtk-doc.m4
diff --git a/recipes-gnome/gnome/files/gtk-doc.make b/meta-oe/recipes-gnome/gnome/files/gtk-doc.make
index 354ffb7c6..354ffb7c6 100644
--- a/recipes-gnome/gnome/files/gtk-doc.make
+++ b/meta-oe/recipes-gnome/gnome/files/gtk-doc.make
diff --git a/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch b/meta-oe/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch
index b65b3608d..b65b3608d 100644
--- a/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch
+++ b/meta-oe/recipes-gnome/gnome/files/libproxy-move-define-__USE_BSD.patch
diff --git a/recipes-gnome/gnome/files/tasn.m4 b/meta-oe/recipes-gnome/gnome/files/tasn.m4
index 6df32085a..6df32085a 100644
--- a/recipes-gnome/gnome/files/tasn.m4
+++ b/meta-oe/recipes-gnome/gnome/files/tasn.m4
diff --git a/recipes-gnome/gnome/gconf-native_2.6.1.bb b/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb
index fac712395..fac712395 100644
--- a/recipes-gnome/gnome/gconf-native_2.6.1.bb
+++ b/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb
diff --git a/recipes-gnome/gnome/gconf_2.28.0.bb b/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb
index e167d8a6d..e167d8a6d 100644
--- a/recipes-gnome/gnome/gconf_2.28.0.bb
+++ b/meta-oe/recipes-gnome/gnome/gconf_2.28.0.bb
diff --git a/recipes-gnome/gnome/orbit2-2.14.17/configure-lossage.patch b/meta-oe/recipes-gnome/gnome/orbit2-2.14.17/configure-lossage.patch
index 5fc1de561..5fc1de561 100644
--- a/recipes-gnome/gnome/orbit2-2.14.17/configure-lossage.patch
+++ b/meta-oe/recipes-gnome/gnome/orbit2-2.14.17/configure-lossage.patch
diff --git a/recipes-gnome/gnome/orbit2-native_2.14.12.bb b/meta-oe/recipes-gnome/gnome/orbit2-native_2.14.12.bb
index 1db2496c3..1db2496c3 100644
--- a/recipes-gnome/gnome/orbit2-native_2.14.12.bb
+++ b/meta-oe/recipes-gnome/gnome/orbit2-native_2.14.12.bb
diff --git a/recipes-gnome/gnome/orbit2.inc b/meta-oe/recipes-gnome/gnome/orbit2.inc
index 51978909b..51978909b 100644
--- a/recipes-gnome/gnome/orbit2.inc
+++ b/meta-oe/recipes-gnome/gnome/orbit2.inc
diff --git a/recipes-gnome/gnome/orbit2/configure-lossage.patch b/meta-oe/recipes-gnome/gnome/orbit2/configure-lossage.patch
index 7485a0ce0..7485a0ce0 100644
--- a/recipes-gnome/gnome/orbit2/configure-lossage.patch
+++ b/meta-oe/recipes-gnome/gnome/orbit2/configure-lossage.patch
diff --git a/recipes-gnome/gnome/orbit2/pkgconfig-fix.patch b/meta-oe/recipes-gnome/gnome/orbit2/pkgconfig-fix.patch
index f629e506d..f629e506d 100644
--- a/recipes-gnome/gnome/orbit2/pkgconfig-fix.patch
+++ b/meta-oe/recipes-gnome/gnome/orbit2/pkgconfig-fix.patch
diff --git a/recipes-gnome/gnome/orbit2_2.14.17.bb b/meta-oe/recipes-gnome/gnome/orbit2_2.14.17.bb
index 47f632793..47f632793 100644
--- a/recipes-gnome/gnome/orbit2_2.14.17.bb
+++ b/meta-oe/recipes-gnome/gnome/orbit2_2.14.17.bb
diff --git a/recipes-gnome/gtk+/composite-pixbuf_0.0.bb b/meta-oe/recipes-gnome/gtk+/composite-pixbuf_0.0.bb
index 29e329a4a..29e329a4a 100644
--- a/recipes-gnome/gtk+/composite-pixbuf_0.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/composite-pixbuf_0.0.bb
diff --git a/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch
index 36e955700..36e955700 100644
--- a/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch
diff --git a/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch
index 10e84d3ba..10e84d3ba 100644
--- a/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch
diff --git a/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
index 82fbbac8d..82fbbac8d 100644
--- a/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
diff --git a/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
index 0fc4c48d1..0fc4c48d1 100644
--- a/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
diff --git a/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
index aa1bffa8a..aa1bffa8a 100644
--- a/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
diff --git a/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
index 59ad150b2..59ad150b2 100644
--- a/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
+++ b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
diff --git a/recipes-gnome/gtk+/gtk+.inc b/meta-oe/recipes-gnome/gtk+/gtk+.inc
index 42a8febcd..42a8febcd 100644
--- a/recipes-gnome/gtk+/gtk+.inc
+++ b/meta-oe/recipes-gnome/gtk+/gtk+.inc
diff --git a/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch b/meta-oe/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch
index 7b37d4bb2..7b37d4bb2 100644
--- a/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch
diff --git a/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch b/meta-oe/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch
index df2965634..df2965634 100644
--- a/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch
diff --git a/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch b/meta-oe/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch
index 6cf1c1499..6cf1c1499 100644
--- a/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch
diff --git a/recipes-gnome/gtk+/gtk+/migration.patch b/meta-oe/recipes-gnome/gtk+/gtk+/migration.patch
index f4c7f853a..f4c7f853a 100644
--- a/recipes-gnome/gtk+/gtk+/migration.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/migration.patch
diff --git a/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch b/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch
index b74d9c963..b74d9c963 100644
--- a/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch
diff --git a/recipes-gnome/gtk+/gtk+/xsettings.patch b/meta-oe/recipes-gnome/gtk+/gtk+/xsettings.patch
index b63e262d3..b63e262d3 100644
--- a/recipes-gnome/gtk+/gtk+/xsettings.patch
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/xsettings.patch
diff --git a/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.20.1.bb
index c565514a1..c565514a1 100644
--- a/recipes-gnome/gtk+/gtk+_2.20.1.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.20.1.bb
diff --git a/recipes-gnome/gtk+/gtk-fpu.inc b/meta-oe/recipes-gnome/gtk+/gtk-fpu.inc
index 52cdc3b44..52cdc3b44 100644
--- a/recipes-gnome/gtk+/gtk-fpu.inc
+++ b/meta-oe/recipes-gnome/gtk+/gtk-fpu.inc
diff --git a/recipes-gnome/hicolor-icon-theme/files/index.theme b/meta-oe/recipes-gnome/hicolor-icon-theme/files/index.theme
index 0471bd53f..0471bd53f 100644
--- a/recipes-gnome/hicolor-icon-theme/files/index.theme
+++ b/meta-oe/recipes-gnome/hicolor-icon-theme/files/index.theme
diff --git a/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta-oe/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index 1934cdb50..1934cdb50 100644
--- a/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta-oe/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
diff --git a/recipes-gnome/libidl/libidl-native_0.8.13.bb b/meta-oe/recipes-gnome/libidl/libidl-native_0.8.13.bb
index 834f4af42..834f4af42 100644
--- a/recipes-gnome/libidl/libidl-native_0.8.13.bb
+++ b/meta-oe/recipes-gnome/libidl/libidl-native_0.8.13.bb
diff --git a/recipes-gnome/libidl/libidl.inc b/meta-oe/recipes-gnome/libidl/libidl.inc
index 7a90a7044..7a90a7044 100644
--- a/recipes-gnome/libidl/libidl.inc
+++ b/meta-oe/recipes-gnome/libidl/libidl.inc
diff --git a/recipes-gnome/libidl/libidl_0.8.13.bb b/meta-oe/recipes-gnome/libidl/libidl_0.8.13.bb
index 732178d03..732178d03 100644
--- a/recipes-gnome/libidl/libidl_0.8.13.bb
+++ b/meta-oe/recipes-gnome/libidl/libidl_0.8.13.bb
diff --git a/recipes-gnome/policykit/policykit-gnome_0.96.bb b/meta-oe/recipes-gnome/policykit/policykit-gnome_0.96.bb
index 8720ea9fe..8720ea9fe 100644
--- a/recipes-gnome/policykit/policykit-gnome_0.96.bb
+++ b/meta-oe/recipes-gnome/policykit/policykit-gnome_0.96.bb
diff --git a/recipes-gnome/policykit/policykit_0.96.bb b/meta-oe/recipes-gnome/policykit/policykit_0.96.bb
index 98c0dd0d2..98c0dd0d2 100644
--- a/recipes-gnome/policykit/policykit_0.96.bb
+++ b/meta-oe/recipes-gnome/policykit/policykit_0.96.bb
diff --git a/recipes-graphics/cairo/cairo-fpu.inc b/meta-oe/recipes-graphics/cairo/cairo-fpu.inc
index bdaf78979..bdaf78979 100644
--- a/recipes-graphics/cairo/cairo-fpu.inc
+++ b/meta-oe/recipes-graphics/cairo/cairo-fpu.inc
diff --git a/recipes-graphics/cairo/cairo.inc b/meta-oe/recipes-graphics/cairo/cairo.inc
index 42774e05b..42774e05b 100644
--- a/recipes-graphics/cairo/cairo.inc
+++ b/meta-oe/recipes-graphics/cairo/cairo.inc
diff --git a/recipes-graphics/cairo/cairo_1.10.0.bb b/meta-oe/recipes-graphics/cairo/cairo_1.10.0.bb
index dccb726ed..dccb726ed 100644
--- a/recipes-graphics/cairo/cairo_1.10.0.bb
+++ b/meta-oe/recipes-graphics/cairo/cairo_1.10.0.bb
diff --git a/recipes-graphics/font-update-common/font-update-common/update-fonts b/meta-oe/recipes-graphics/font-update-common/font-update-common/update-fonts
index 19e3157d2..19e3157d2 100644
--- a/recipes-graphics/font-update-common/font-update-common/update-fonts
+++ b/meta-oe/recipes-graphics/font-update-common/font-update-common/update-fonts
diff --git a/recipes-graphics/font-update-common/font-update-common_0.1.bb b/meta-oe/recipes-graphics/font-update-common/font-update-common_0.1.bb
index 4a4c714ec..4a4c714ec 100644
--- a/recipes-graphics/font-update-common/font-update-common_0.1.bb
+++ b/meta-oe/recipes-graphics/font-update-common/font-update-common_0.1.bb
diff --git a/recipes-graphics/jasper/jasper_1.900.1.bb b/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
index ef9ca6fb4..ef9ca6fb4 100644
--- a/recipes-graphics/jasper/jasper_1.900.1.bb
+++ b/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
diff --git a/recipes-graphics/pango/pango-1.28.3/no-tests.patch b/meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
index dafcb20c3..dafcb20c3 100644
--- a/recipes-graphics/pango/pango-1.28.3/no-tests.patch
+++ b/meta-oe/recipes-graphics/pango/pango-1.28.3/no-tests.patch
diff --git a/recipes-graphics/pango/pango.inc b/meta-oe/recipes-graphics/pango/pango.inc
index b09869135..b09869135 100644
--- a/recipes-graphics/pango/pango.inc
+++ b/meta-oe/recipes-graphics/pango/pango.inc
diff --git a/recipes-graphics/pango/pango/no-tests.patch b/meta-oe/recipes-graphics/pango/pango/no-tests.patch
index b38212612..b38212612 100644
--- a/recipes-graphics/pango/pango/no-tests.patch
+++ b/meta-oe/recipes-graphics/pango/pango/no-tests.patch
diff --git a/recipes-graphics/pango/pango/pkgconfig_fixes.patch b/meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch
index f021591a9..f021591a9 100644
--- a/recipes-graphics/pango/pango/pkgconfig_fixes.patch
+++ b/meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch
diff --git a/recipes-graphics/pango/pango_1.28.3.bb b/meta-oe/recipes-graphics/pango/pango_1.28.3.bb
index 4c875bf33..4c875bf33 100644
--- a/recipes-graphics/pango/pango_1.28.3.bb
+++ b/meta-oe/recipes-graphics/pango/pango_1.28.3.bb
diff --git a/recipes-graphics/pango/pangomm_2.26.0.bb b/meta-oe/recipes-graphics/pango/pangomm_2.26.0.bb
index ecf2dd1ee..ecf2dd1ee 100644
--- a/recipes-graphics/pango/pangomm_2.26.0.bb
+++ b/meta-oe/recipes-graphics/pango/pangomm_2.26.0.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
index bb259b918..bb259b918 100644
--- a/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
index 9c6e56bf7..9c6e56bf7 100644
--- a/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
diff --git a/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb
index f852cbffd..f852cbffd 100644
--- a/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
index 3fa04abf5..3fa04abf5 100644
--- a/recipes-graphics/ttf-fonts/ttf-droid_git.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-gentium/OFL.gz b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium/OFL.gz
index 7ebada757..7ebada757 100644
--- a/recipes-graphics/ttf-fonts/ttf-gentium/OFL.gz
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium/OFL.gz
diff --git a/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
index 698b2edf8..698b2edf8 100644
--- a/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
index 3984f868a..3984f868a 100644
--- a/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
index a6f885b8d..a6f885b8d 100644
--- a/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
index 1b9a01b2a..1b9a01b2a 100644
--- a/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb
index cc8d2e4cb..cc8d2e4cb 100644
--- a/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb
diff --git a/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb
index 2d1d23e12..2d1d23e12 100644
--- a/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb
diff --git a/recipes-graphics/ttf-fonts/ttf.inc b/meta-oe/recipes-graphics/ttf-fonts/ttf.inc
index af3f27853..af3f27853 100644
--- a/recipes-graphics/ttf-fonts/ttf.inc
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf.inc
diff --git a/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
index 5ac3b7ae9..5ac3b7ae9 100644
--- a/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-blacklist-tv-out.patch
diff --git a/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
index 41d5f131a..41d5f131a 100644
--- a/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
diff --git a/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
index 06eeca9d2..06eeca9d2 100644
--- a/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
diff --git a/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 85b68b17c..85b68b17c 100644
--- a/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
diff --git a/recipes-graphics/xorg-lib/libxext_1.2.0.bb b/meta-oe/recipes-graphics/xorg-lib/libxext_1.2.0.bb
index 3d18d6288..3d18d6288 100644
--- a/recipes-graphics/xorg-lib/libxext_1.2.0.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/libxext_1.2.0.bb
diff --git a/recipes-graphics/xorg-lib/libxrender_0.9.6.bb b/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
index c1bb045f8..c1bb045f8 100644
--- a/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0000-Add-pixman_bits_override_accessors.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0000-Add-pixman_bits_override_accessors.patch
index 43cd44268..43cd44268 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0000-Add-pixman_bits_override_accessors.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0000-Add-pixman_bits_override_accessors.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
index 795cce5ba..795cce5ba 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0001-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
index 6e2d492aa..6e2d492aa 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0002-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
index 910f62e6d..910f62e6d 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0003-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
index f6aa9792b..f6aa9792b 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0004-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
index dbe98b38c..dbe98b38c 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0005-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0006-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0006-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch
index d050646fa..d050646fa 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0006-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0006-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0007-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0007-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch
index 7f28f47cf..7f28f47cf 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0007-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0007-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.20.0/0008-ARM-optimization-for-scaled-src_0565_0565-operation-.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0008-ARM-optimization-for-scaled-src_0565_0565-operation-.patch
index 6efdb621a..6efdb621a 100644
--- a/recipes-graphics/xorg-lib/pixman-0.20.0/0008-ARM-optimization-for-scaled-src_0565_0565-operation-.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.20.0/0008-ARM-optimization-for-scaled-src_0565_0565-operation-.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0017-add-_pixman_bits_override_accessors.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0017-add-_pixman_bits_override_accessors.patch
index b7983b208..b7983b208 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0017-add-_pixman_bits_override_accessors.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0017-add-_pixman_bits_override_accessors.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0018-Generic-C-implementation-of-pixman_blt-with-overlapp.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0018-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
index 5b1c1089e..5b1c1089e 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0018-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0018-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0019-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0019-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
index 5193d38f7..5193d38f7 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0019-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0019-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0020-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0020-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
index f5c0e12f2..f5c0e12f2 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0020-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0020-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0021-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0021-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
index 0eb9d88eb..0eb9d88eb 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0021-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0021-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0022-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0022-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
index 129c1f1bb..129c1f1bb 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0022-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0022-ARM-added-NEON-optimizations-for-fetch-store-r5g6b5-.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0023-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0023-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch
index 7724f5433..7724f5433 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0023-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0023-ARM-added-NEON-optimizations-for-fetch-store-a8-scan.patch
diff --git a/recipes-graphics/xorg-lib/pixman-0.21.4/0024-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0024-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch
index 8253f41b8..8253f41b8 100644
--- a/recipes-graphics/xorg-lib/pixman-0.21.4/0024-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.21.4/0024-ARM-added-NEON-optimizations-for-fetching-x8r8g8b8-s.patch
diff --git a/recipes-graphics/xorg-lib/pixman.inc b/meta-oe/recipes-graphics/xorg-lib/pixman.inc
index 539a33a88..539a33a88 100644
--- a/recipes-graphics/xorg-lib/pixman.inc
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman.inc
diff --git a/recipes-graphics/xorg-lib/pixman_0.20.0.bb b/meta-oe/recipes-graphics/xorg-lib/pixman_0.20.0.bb
index b3fbd4f15..b3fbd4f15 100644
--- a/recipes-graphics/xorg-lib/pixman_0.20.0.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.20.0.bb
diff --git a/recipes-graphics/xorg-lib/pixman_0.21.4.bb b/meta-oe/recipes-graphics/xorg-lib/pixman_0.21.4.bb
index f0e9e388b..f0e9e388b 100644
--- a/recipes-graphics/xorg-lib/pixman_0.21.4.bb
+++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.21.4.bb
diff --git a/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta-oe/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 93212c591..93212c591 100644
--- a/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta-oe/recipes-graphics/xorg-lib/xorg-lib-common.inc
diff --git a/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
index 7e3844847..7e3844847 100644
--- a/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
+++ b/meta-oe/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
diff --git a/recipes-graphics/xorg-proto/xorg-proto-common.inc b/meta-oe/recipes-graphics/xorg-proto/xorg-proto-common.inc
index 3e7c701c7..3e7c701c7 100644
--- a/recipes-graphics/xorg-proto/xorg-proto-common.inc
+++ b/meta-oe/recipes-graphics/xorg-proto/xorg-proto-common.inc
diff --git a/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch b/meta-oe/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch
index a6494fd4a..a6494fd4a 100644
--- a/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch
+++ b/meta-oe/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch
diff --git a/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb b/meta-oe/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
index 9347ef493..9347ef493 100644
--- a/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
+++ b/meta-oe/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
diff --git a/recipes-multimedia/gstreamer/gst-plugins.inc b/meta-oe/recipes-multimedia/gstreamer/gst-plugins.inc
index cd3e0a0a9..cd3e0a0a9 100644
--- a/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta-oe/recipes-multimedia/gstreamer/gst-plugins.inc
diff --git a/meta-oe/recipes-qt/qt-apps/fotowall_0.9.bb b/meta-oe/recipes-qt/qt-apps/fotowall_0.9.bb
new file mode 100644
index 000000000..20a582092
--- /dev/null
+++ b/meta-oe/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Fotowall is a creative tool that allows you to layout your photos or pictures \
+in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.."
+
+HOMEPAGE = "http://www.enricoros.com/opensource/fotowall"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
+                    file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
+SECTION = "x11/apps"
+
+PR = "r1"
+
+inherit qt4x11 pkgconfig
+
+RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
+
+SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
+
+SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
+SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"
+
+S = "${WORKDIR}/Fotowall-${PV}"
+
+do_install() {
+        oe_runmake INSTALL_ROOT=${D} install
+}
diff --git a/meta-oe/recipes-qt/qt-apps/qmmp_0.4.3.bb b/meta-oe/recipes-qt/qt-apps/qmmp_0.4.3.bb
new file mode 100644
index 000000000..eadef6206
--- /dev/null
+++ b/meta-oe/recipes-qt/qt-apps/qmmp_0.4.3.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
+HOMEPAGE = "http://qmmp.ylsoftware.com"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+SECTION = "multimedia"
+
+PR = "r0"
+
+DEPENDS = "taglib libmad libvorbis libogg alsa-lib"
+RDEPENDS_${PN} += "taglib alsa-lib curl"
+
+inherit qt4x11 cmake
+
+SRC_URI = "http://qmmp.ylsoftware.com/files/${PN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "b79ce55ed8aca31a29360ff828ce1881"
+SRC_URI[sha256sum] = "a75c2c676515182ecfbe811cba29ba4ca736912e52fde283db4d03eb116457a4"
+
+PARALLEL_MAKE = ""
+
+export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+                        -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
+                        -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+                        -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+                        -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+                        -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
+                        -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
+                        -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
+                        "
+
+FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \ 
+               ${libdir}/qmmp/PlaylistFormats/*.so \
+               ${libdir}/qmmp/Output/libalsa.so \
+               ${libdir}/qmmp/Transports/libhttp.so \
+               ${libdir}/qmmp/Visual/libanalyzer.so \
+               ${datadir}/icons/* \
+               ${datadir}/qmmp/images/* \
+               ${datadir}/applications/qmmp.desktop \
+               "
+
+PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
+
+FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
+RDEPENDS_${PN}-plugin-input-mad = "libmad"
+FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
+RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
diff --git a/meta-oe/recipes-qt/qt-apps/quicky_0.4.bb b/meta-oe/recipes-qt/qt-apps/quicky_0.4.bb
new file mode 100644
index 000000000..89894457c
--- /dev/null
+++ b/meta-oe/recipes-qt/qt-apps/quicky_0.4.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "A simple note-taking application with Wiki-style syntax and behaviour"
+HOMEPAGE = "http://qt-apps.org/content/show.php/Quicky?content=80325"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14"
+SECTION = "x11/apps"
+
+PR = "r1"
+
+
+SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
+
+SRC_URI[md5sum] = "824d9e477ee9c4994f73a3cb215161d9"
+SRC_URI[sha256sum] = "9c66376e0035d44547612bf629890769a6178c3e7eafbcf95f1c6207ac0f352a"
+
+inherit qt4x11
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/${PN} ${D}${bindir}
+}
diff --git a/recipes-qt/qt4/files/0001-cross-compile.patch b/meta-oe/recipes-qt/qt4/files/0001-cross-compile.patch
index 053be06e5..053be06e5 100644
--- a/recipes-qt/qt4/files/0001-cross-compile.patch
+++ b/meta-oe/recipes-qt/qt4/files/0001-cross-compile.patch
diff --git a/recipes-qt/qt4/files/0001-fix-mkspecs.patch b/meta-oe/recipes-qt/qt4/files/0001-fix-mkspecs.patch
index 0fccb57c0..0fccb57c0 100644
--- a/recipes-qt/qt4/files/0001-fix-mkspecs.patch
+++ b/meta-oe/recipes-qt/qt4/files/0001-fix-mkspecs.patch
diff --git a/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch b/meta-oe/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
index be4d5c0e2..be4d5c0e2 100644
--- a/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
+++ b/meta-oe/recipes-qt/qt4/files/0002-fix-resinit-declaration.patch
diff --git a/recipes-qt/qt4/files/0004-no-qmake.patch b/meta-oe/recipes-qt/qt4/files/0004-no-qmake.patch
index a58b19f90..a58b19f90 100644
--- a/recipes-qt/qt4/files/0004-no-qmake.patch
+++ b/meta-oe/recipes-qt/qt4/files/0004-no-qmake.patch
diff --git a/recipes-qt/qt4/files/0006-freetype-host-includes.patch b/meta-oe/recipes-qt/qt4/files/0006-freetype-host-includes.patch
index 081d8992e..081d8992e 100644
--- a/recipes-qt/qt4/files/0006-freetype-host-includes.patch
+++ b/meta-oe/recipes-qt/qt4/files/0006-freetype-host-includes.patch
diff --git a/recipes-qt/qt4/files/0008-qt-lib-infix.patch b/meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch
index a1b89124d..a1b89124d 100644
--- a/recipes-qt/qt4/files/0008-qt-lib-infix.patch
+++ b/meta-oe/recipes-qt/qt4/files/0008-qt-lib-infix.patch
diff --git a/recipes-qt/qt4/files/0009-support-2bpp.patch b/meta-oe/recipes-qt/qt4/files/0009-support-2bpp.patch
index cf44ea821..cf44ea821 100644
--- a/recipes-qt/qt4/files/0009-support-2bpp.patch
+++ b/meta-oe/recipes-qt/qt4/files/0009-support-2bpp.patch
diff --git a/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch b/meta-oe/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
index e52736926..e52736926 100644
--- a/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
+++ b/meta-oe/recipes-qt/qt4/files/0010-no-simpledecoration-example.patch
diff --git a/recipes-qt/qt4/files/common.pro b/meta-oe/recipes-qt/qt4/files/common.pro
index 382d93f5d..382d93f5d 100644
--- a/recipes-qt/qt4/files/common.pro
+++ b/meta-oe/recipes-qt/qt4/files/common.pro
diff --git a/recipes-qt/qt4/files/compile.test-lflags.patch b/meta-oe/recipes-qt/qt4/files/compile.test-lflags.patch
index e4b256b0c..e4b256b0c 100644
--- a/recipes-qt/qt4/files/compile.test-lflags.patch
+++ b/meta-oe/recipes-qt/qt4/files/compile.test-lflags.patch
diff --git a/recipes-qt/qt4/files/configure-lflags.patch b/meta-oe/recipes-qt/qt4/files/configure-lflags.patch
index df195494e..df195494e 100644
--- a/recipes-qt/qt4/files/configure-lflags.patch
+++ b/meta-oe/recipes-qt/qt4/files/configure-lflags.patch
diff --git a/recipes-qt/qt4/files/configure-paths.patch b/meta-oe/recipes-qt/qt4/files/configure-paths.patch
index c9259a115..c9259a115 100644
--- a/recipes-qt/qt4/files/configure-paths.patch
+++ b/meta-oe/recipes-qt/qt4/files/configure-paths.patch
diff --git a/recipes-qt/qt4/files/fix-config-tests.patch b/meta-oe/recipes-qt/qt4/files/fix-config-tests.patch
index 21054555b..21054555b 100644
--- a/recipes-qt/qt4/files/fix-config-tests.patch
+++ b/meta-oe/recipes-qt/qt4/files/fix-config-tests.patch
diff --git a/recipes-qt/qt4/files/g++.conf b/meta-oe/recipes-qt/qt4/files/g++.conf
index 4cd76e62e..4cd76e62e 100644
--- a/recipes-qt/qt4/files/g++.conf
+++ b/meta-oe/recipes-qt/qt4/files/g++.conf
diff --git a/recipes-qt/qt4/files/hack-out-pg_config.patch b/meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch
index 650ed7745..650ed7745 100644
--- a/recipes-qt/qt4/files/hack-out-pg_config.patch
+++ b/meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch
diff --git a/recipes-qt/qt4/files/linux-oe-qmake.conf b/meta-oe/recipes-qt/qt4/files/linux-oe-qmake.conf
index 205b693fd..205b693fd 100644
--- a/recipes-qt/qt4/files/linux-oe-qmake.conf
+++ b/meta-oe/recipes-qt/qt4/files/linux-oe-qmake.conf
diff --git a/recipes-qt/qt4/files/linux.conf b/meta-oe/recipes-qt/qt4/files/linux.conf
index 90b8d65ab..90b8d65ab 100644
--- a/recipes-qt/qt4/files/linux.conf
+++ b/meta-oe/recipes-qt/qt4/files/linux.conf
diff --git a/recipes-qt/qt4/files/mips-relocate.patch b/meta-oe/recipes-qt/qt4/files/mips-relocate.patch
index 2fde9a0dc..2fde9a0dc 100644
--- a/recipes-qt/qt4/files/mips-relocate.patch
+++ b/meta-oe/recipes-qt/qt4/files/mips-relocate.patch
diff --git a/recipes-qt/qt4/files/qmake-exists-check.patch b/meta-oe/recipes-qt/qt4/files/qmake-exists-check.patch
index cc73837e5..cc73837e5 100644
--- a/recipes-qt/qt4/files/qmake-exists-check.patch
+++ b/meta-oe/recipes-qt/qt4/files/qmake-exists-check.patch
diff --git a/recipes-qt/qt4/files/qmake-hack.diff b/meta-oe/recipes-qt/qt4/files/qmake-hack.diff
index 290f54052..290f54052 100644
--- a/recipes-qt/qt4/files/qmake-hack.diff
+++ b/meta-oe/recipes-qt/qt4/files/qmake-hack.diff
diff --git a/recipes-qt/qt4/files/qt-config.patch b/meta-oe/recipes-qt/qt4/files/qt-config.patch
index a31e7b3e2..a31e7b3e2 100644
--- a/recipes-qt/qt4/files/qt-config.patch
+++ b/meta-oe/recipes-qt/qt4/files/qt-config.patch
diff --git a/recipes-qt/qt4/files/qte.sh b/meta-oe/recipes-qt/qt4/files/qte.sh
index 21d6ecbd6..21d6ecbd6 100644
--- a/recipes-qt/qt4/files/qte.sh
+++ b/meta-oe/recipes-qt/qt4/files/qte.sh
diff --git a/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch b/meta-oe/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
index 1d250d8a9..1d250d8a9 100644
--- a/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
+++ b/meta-oe/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch
diff --git a/recipes-qt/qt4/files/use-lflags-last.patch b/meta-oe/recipes-qt/qt4/files/use-lflags-last.patch
index 4197dbbf6..4197dbbf6 100644
--- a/recipes-qt/qt4/files/use-lflags-last.patch
+++ b/meta-oe/recipes-qt/qt4/files/use-lflags-last.patch
diff --git a/recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf b/meta-oe/recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf
index f58481a69..f58481a69 100644
--- a/recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf
+++ b/meta-oe/recipes-qt/qt4/qmake2-sdk/linux-oe-qmake.conf
diff --git a/recipes-qt/qt4/qmake2.inc b/meta-oe/recipes-qt/qt4/qmake2.inc
index f2631b5f7..f2631b5f7 100644
--- a/recipes-qt/qt4/qmake2.inc
+++ b/meta-oe/recipes-qt/qt4/qmake2.inc
diff --git a/recipes-qt/qt4/qmake2/linux-oe-qmake.conf b/meta-oe/recipes-qt/qt4/qmake2/linux-oe-qmake.conf
index f58481a69..f58481a69 100644
--- a/recipes-qt/qt4/qmake2/linux-oe-qmake.conf
+++ b/meta-oe/recipes-qt/qt4/qmake2/linux-oe-qmake.conf
diff --git a/recipes-qt/qt4/qmake2_2.10a.bb b/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb
index 3602a7f24..3602a7f24 100644
--- a/recipes-qt/qt4/qmake2_2.10a.bb
+++ b/meta-oe/recipes-qt/qt4/qmake2_2.10a.bb
diff --git a/recipes-qt/qt4/qt-4.6.0/.1165-NEON-configure-detection-and-initial-blend-function-.patch.swp b/meta-oe/recipes-qt/qt4/qt-4.6.0/.1165-NEON-configure-detection-and-initial-blend-function-.patch.swp
index 5a11254f6..5a11254f6 100644
--- a/recipes-qt/qt4/qt-4.6.0/.1165-NEON-configure-detection-and-initial-blend-function-.patch.swp
+++ b/meta-oe/recipes-qt/qt4/qt-4.6.0/.1165-NEON-configure-detection-and-initial-blend-function-.patch.swp
diff --git a/recipes-qt/qt4/qt-4.6.3.inc b/meta-oe/recipes-qt/qt4/qt-4.6.3.inc
index a41b48318..a41b48318 100644
--- a/recipes-qt/qt4/qt-4.6.3.inc
+++ b/meta-oe/recipes-qt/qt4/qt-4.6.3.inc
diff --git a/recipes-qt/qt4/qt-4.7.1.inc b/meta-oe/recipes-qt/qt4/qt-4.7.1.inc
index 70ee59697..70ee59697 100644
--- a/recipes-qt/qt4/qt-4.7.1.inc
+++ b/meta-oe/recipes-qt/qt4/qt-4.7.1.inc
diff --git a/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch b/meta-oe/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch
index 71a04a59d..71a04a59d 100644
--- a/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta-oe/recipes-qt/qt4/qt-4.7.1/0001-Added-Openembedded-crossarch-option.patch
diff --git a/recipes-qt/qt4/qt-4.7.1/g++.conf b/meta-oe/recipes-qt/qt4/qt-4.7.1/g++.conf
index 80f925cc5..80f925cc5 100644
--- a/recipes-qt/qt4/qt-4.7.1/g++.conf
+++ b/meta-oe/recipes-qt/qt4/qt-4.7.1/g++.conf
diff --git a/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch b/meta-oe/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch
index 5c588ff0f..5c588ff0f 100644
--- a/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch
+++ b/meta-oe/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch
diff --git a/recipes-qt/qt4/qt-4.7.1/linux.conf b/meta-oe/recipes-qt/qt4/qt-4.7.1/linux.conf
index a54135513..a54135513 100644
--- a/recipes-qt/qt4/qt-4.7.1/linux.conf
+++ b/meta-oe/recipes-qt/qt4/qt-4.7.1/linux.conf
diff --git a/recipes-qt/qt4/qt4-embedded-4.6.3/0006-freetype-host-includes.patch b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0006-freetype-host-includes.patch
index 987c42513..987c42513 100644
--- a/recipes-qt/qt4/qt4-embedded-4.6.3/0006-freetype-host-includes.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0006-freetype-host-includes.patch
diff --git a/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch
index 61e60a0eb..61e60a0eb 100644
--- a/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch
diff --git a/recipes-qt/qt4/qt4-embedded-4.6.3/0010-no-simpledecoration-example.patch b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0010-no-simpledecoration-example.patch
index fce5bba93..fce5bba93 100644
--- a/recipes-qt/qt4/qt4-embedded-4.6.3/0010-no-simpledecoration-example.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0010-no-simpledecoration-example.patch
diff --git a/recipes-qt/qt4/qt4-embedded-4.6.3/linux.conf b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/linux.conf
index 68ae80b92..68ae80b92 100644
--- a/recipes-qt/qt4/qt4-embedded-4.6.3/linux.conf
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/linux.conf
diff --git a/recipes-qt/qt4/qt4-embedded.inc b/meta-oe/recipes-qt/qt4/qt4-embedded.inc
index 2ed1819f6..2ed1819f6 100644
--- a/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded.inc
diff --git a/recipes-qt/qt4/qt4-embedded/0006-freetype-host-includes.patch b/meta-oe/recipes-qt/qt4/qt4-embedded/0006-freetype-host-includes.patch
index 987c42513..987c42513 100644
--- a/recipes-qt/qt4/qt4-embedded/0006-freetype-host-includes.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded/0006-freetype-host-includes.patch
diff --git a/recipes-qt/qt4/qt4-embedded_4.6.3.bb b/meta-oe/recipes-qt/qt4/qt4-embedded_4.6.3.bb
index dd662aa3d..dd662aa3d 100644
--- a/recipes-qt/qt4/qt4-embedded_4.6.3.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded_4.6.3.bb
diff --git a/recipes-qt/qt4/qt4-embedded_4.7.1.bb b/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.1.bb
index c3f671319..c3f671319 100644
--- a/recipes-qt/qt4/qt4-embedded_4.7.1.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded_4.7.1.bb
diff --git a/recipes-qt/qt4/qt4-tools-native.inc b/meta-oe/recipes-qt/qt4/qt4-tools-native.inc
index 9114e7df6..9114e7df6 100644
--- a/recipes-qt/qt4/qt4-tools-native.inc
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-native.inc
diff --git a/recipes-qt/qt4/qt4-tools-native_4.6.3.bb b/meta-oe/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
index dae8cd19e..dae8cd19e 100644
--- a/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
diff --git a/recipes-qt/qt4/qt4-tools-native_4.7.1.bb b/meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
index e9de510fe..e9de510fe 100644
--- a/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.1.bb
diff --git a/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta-oe/recipes-qt/qt4/qt4-tools-nativesdk.inc
index f273c9fab..f273c9fab 100644
--- a/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-nativesdk.inc
diff --git a/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb b/meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
index d64542b5f..d64542b5f 100644
--- a/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
diff --git a/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb b/meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
index 091a53927..091a53927 100644
--- a/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
diff --git a/recipes-qt/qt4/qt4-tools-sdk.inc b/meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc
index 1bcfed060..1bcfed060 100644
--- a/recipes-qt/qt4/qt4-tools-sdk.inc
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-sdk.inc
diff --git a/recipes-qt/qt4/qt4-tools-sdk_4.6.3.bb b/meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.6.3.bb
index 591350717..591350717 100644
--- a/recipes-qt/qt4/qt4-tools-sdk_4.6.3.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.6.3.bb
diff --git a/recipes-qt/qt4/qt4-tools-sdk_4.7.1.bb b/meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.1.bb
index 1018f74c3..1018f74c3 100644
--- a/recipes-qt/qt4/qt4-tools-sdk_4.7.1.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.1.bb
diff --git a/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf b/meta-oe/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
index 68ae80b92..68ae80b92 100644
--- a/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
diff --git a/recipes-qt/qt4/qt4-x11-free.inc b/meta-oe/recipes-qt/qt4/qt4-x11-free.inc
index 057a129ec..057a129ec 100644
--- a/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free.inc
diff --git a/recipes-qt/qt4/qt4-x11-free/0003-no-tools.patch b/meta-oe/recipes-qt/qt4/qt4-x11-free/0003-no-tools.patch
index 3829ffcdc..3829ffcdc 100644
--- a/recipes-qt/qt4/qt4-x11-free/0003-no-tools.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free/0003-no-tools.patch
diff --git a/recipes-qt/qt4/qt4-x11-free/0006-freetype-host-includes.patch b/meta-oe/recipes-qt/qt4/qt4-x11-free/0006-freetype-host-includes.patch
index 987c42513..987c42513 100644
--- a/recipes-qt/qt4/qt4-x11-free/0006-freetype-host-includes.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free/0006-freetype-host-includes.patch
diff --git a/recipes-qt/qt4/qt4-x11-free/0007-openssl-host-includes.patch b/meta-oe/recipes-qt/qt4/qt4-x11-free/0007-openssl-host-includes.patch
index 3409cc0bf..3409cc0bf 100644
--- a/recipes-qt/qt4/qt4-x11-free/0007-openssl-host-includes.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free/0007-openssl-host-includes.patch
diff --git a/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch b/meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch
index 3efaff37d..3efaff37d 100644
--- a/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free/0008-qt-lib-infix.patch
diff --git a/recipes-qt/qt4/qt4-x11-free_4.6.3.bb b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
index 8cf544925..8cf544925 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
diff --git a/recipes-qt/qt4/qt4-x11-free_4.7.1.bb b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
index 75c6314e7..75c6314e7 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.7.1.bb
diff --git a/recipes-qt/qt4/qt4.inc b/meta-oe/recipes-qt/qt4/qt4.inc
index 98d55b1be..98d55b1be 100644
--- a/recipes-qt/qt4/qt4.inc
+++ b/meta-oe/recipes-qt/qt4/qt4.inc
diff --git a/recipes-qt/qt4/qt4_arch.inc b/meta-oe/recipes-qt/qt4/qt4_arch.inc
index 7f4be63bc..7f4be63bc 100644
--- a/recipes-qt/qt4/qt4_arch.inc
+++ b/meta-oe/recipes-qt/qt4/qt4_arch.inc
diff --git a/meta-oe/recipes-qt/tasks/task-poky-qt.bb b/meta-oe/recipes-qt/tasks/task-poky-qt.bb
new file mode 100644
index 000000000..da960db5b
--- /dev/null
+++ b/meta-oe/recipes-qt/tasks/task-poky-qt.bb
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2010  Intel Corporation. All rights reserved
+#
+
+DESCRIPTION = "Qt Tasks for Poky"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r3"
+
+PACKAGES = "\
+    task-poky-qt-demos \
+    task-poky-qt-demos-dbg \
+    task-poky-qt-demos-dev \
+    "
+
+ALLOW_EMPTY = "1"
+
+QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
+#QTDEMOS_disabled = "fotowall"
+
+RDEPENDS_task-poky-qt-demos = "${QTDEMOS}"
diff --git a/recipes-support/atk/atk.inc b/meta-oe/recipes-support/atk/atk.inc
index a508012cf..a508012cf 100644
--- a/recipes-support/atk/atk.inc
+++ b/meta-oe/recipes-support/atk/atk.inc
diff --git a/recipes-support/atk/atk_1.30.0.bb b/meta-oe/recipes-support/atk/atk_1.30.0.bb
index cc8f57381..cc8f57381 100644
--- a/recipes-support/atk/atk_1.30.0.bb
+++ b/meta-oe/recipes-support/atk/atk_1.30.0.bb
diff --git a/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch b/meta-oe/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch
index 7b544ca0e..7b544ca0e 100644
--- a/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch
+++ b/meta-oe/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch
diff --git a/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch b/meta-oe/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch
index 21ff0e535..21ff0e535 100644
--- a/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch
+++ b/meta-oe/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch
diff --git a/recipes-support/cups/cups14.inc b/meta-oe/recipes-support/cups/cups14.inc
index 430d3ab5b..430d3ab5b 100644
--- a/recipes-support/cups/cups14.inc
+++ b/meta-oe/recipes-support/cups/cups14.inc
diff --git a/recipes-support/cups/cups_1.4.6.bb b/meta-oe/recipes-support/cups/cups_1.4.6.bb
index 783ecf6b3..783ecf6b3 100644
--- a/recipes-support/cups/cups_1.4.6.bb
+++ b/meta-oe/recipes-support/cups/cups_1.4.6.bb
diff --git a/meta-oe/recipes-support/fftw/benchfft_3.1.bb b/meta-oe/recipes-support/fftw/benchfft_3.1.bb
new file mode 100644
index 000000000..efa76cdce
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/benchfft_3.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "FFTW benchmarks"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+# single precision fftw is called fftwf 
+DEPENDS = "fftwf"
+
+SRC_URI = "http://www.fftw.org/benchfft/benchfft-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+        sed -i -e 's:all-recursive:$(RECURSIVE_TARGETS):g' ${S}/Makefile
+}
+
+SRC_URI[md5sum] = "9356e5e9dcb3f1481977009720a2ccf8"
+SRC_URI[sha256sum] = "1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b"
diff --git a/meta-oe/recipes-support/fftw/fftw.inc b/meta-oe/recipes-support/fftw/fftw.inc
new file mode 100644
index 000000000..40608b61d
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftw.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "FFTW"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RPROVIDES_${PN} += "libfftw3"
+
+PR = "r3"
+
+SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
+
+S = "${WORKDIR}/fftw-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure_prepend() {
+        echo 'AM_PROG_AS' >> ${S}/configure.ac 
+}
+
+PACKAGES =+ "lib${PN}"
+
+FILES_lib${PN} = "${libdir}/lib*.so.*"
+
+# rename binary in /bin and use u-a tpo choose between different precision implementations?
diff --git a/meta-oe/recipes-support/fftw/fftw_3.1.2.bb b/meta-oe/recipes-support/fftw/fftw_3.1.2.bb
new file mode 100644
index 000000000..da8133785
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftw_3.1.2.bb
@@ -0,0 +1,8 @@
+require fftw.inc
+
+EXTRA_OECONF = "--disable-fortran --enable-shared"
+
+
+
+SRC_URI[md5sum] = "08f2e21c9fd02f4be2bd53a62592afa4"
+SRC_URI[sha256sum] = "e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf"
diff --git a/meta-oe/recipes-support/fftw/fftw_3.2.2.bb b/meta-oe/recipes-support/fftw/fftw_3.2.2.bb
new file mode 100644
index 000000000..090e00409
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftw_3.2.2.bb
@@ -0,0 +1,8 @@
+require fftw.inc
+
+SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads"
+
+SRC_URI[md5sum] = "b616e5c91218cc778b5aa735fefb61ae"
+SRC_URI[sha256sum] = "6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f"
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.1.2.bb b/meta-oe/recipes-support/fftw/fftwf_3.1.2.bb
new file mode 100644
index 000000000..a4f246652
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftwf_3.1.2.bb
@@ -0,0 +1,7 @@
+require fftw.inc
+
+EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared"
+
+
+SRC_URI[md5sum] = "08f2e21c9fd02f4be2bd53a62592afa4"
+SRC_URI[sha256sum] = "e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf"
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.2.2.bb b/meta-oe/recipes-support/fftw/fftwf_3.2.2.bb
new file mode 100644
index 000000000..ac0bb6cd8
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftwf_3.2.2.bb
@@ -0,0 +1,8 @@
+require fftw.inc
+
+SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared --enable-threads"
+
+SRC_URI[md5sum] = "b616e5c91218cc778b5aa735fefb61ae"
+SRC_URI[sha256sum] = "6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f"
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.1.2.bb b/meta-oe/recipes-support/fftw/fftwl_3.1.2.bb
new file mode 100644
index 000000000..69256fb9f
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftwl_3.1.2.bb
@@ -0,0 +1,8 @@
+require fftw.inc
+
+EXTRA_OECONF = "--disable-fortran --enable-long-double --enable-shared"
+
+
+
+SRC_URI[md5sum] = "08f2e21c9fd02f4be2bd53a62592afa4"
+SRC_URI[sha256sum] = "e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf"
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.2.2.bb b/meta-oe/recipes-support/fftw/fftwl_3.2.2.bb
new file mode 100644
index 000000000..ff2cb2aaa
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftwl_3.2.2.bb
@@ -0,0 +1,8 @@
+require fftw.inc
+
+SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-fortran --enable-long-double --enable-shared --enable-threads"
+
+SRC_URI[md5sum] = "b616e5c91218cc778b5aa735fefb61ae"
+SRC_URI[sha256sum] = "6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f"
diff --git a/meta-oe/recipes-support/gsl/gsl.inc b/meta-oe/recipes-support/gsl/gsl.inc
new file mode 100644
index 000000000..10bacc523
--- /dev/null
+++ b/meta-oe/recipes-support/gsl/gsl.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "GNU Scientific Library"
+HOMEPAGE = "http://www.gnu.org/software/gsl/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+inherit autotools pkgconfig binconfig
+
+LEAD_SONAME = "libgsl.so"
diff --git a/meta-oe/recipes-support/gsl/gsl_1.12.bb b/meta-oe/recipes-support/gsl/gsl_1.12.bb
new file mode 100644
index 000000000..8fdbbc11e
--- /dev/null
+++ b/meta-oe/recipes-support/gsl/gsl_1.12.bb
@@ -0,0 +1,6 @@
+include gsl.inc
+
+SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "3ec101903c8157756fa1352161bd4c39"
+SRC_URI[sha256sum] = "22019188d24c769acafc250ddc247105eb9cab099529b627078cbd8012c7b7b9"
diff --git a/meta-oe/recipes-support/guile/files/configure-fix.patch b/meta-oe/recipes-support/guile/files/configure-fix.patch
new file mode 100644
index 000000000..c59798d9e
--- /dev/null
+++ b/meta-oe/recipes-support/guile/files/configure-fix.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.in   2008-06-04 12:33:55.451086283 +0200
++++ guile-1.8.5/configure.in    2008-06-04 12:34:03.974994278 +0200
+@@ -38,7 +38,6 @@
+ ]),
+         [bug-guile@gnu.org])
+ AC_CONFIG_AUX_DIR([build-aux])
+-AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(GUILE-VERSION)
+ 
+ AM_INIT_AUTOMAKE([gnu no-define check-news])
diff --git a/meta-oe/recipes-support/guile/files/cpp-linemarkers.patch b/meta-oe/recipes-support/guile/files/cpp-linemarkers.patch
new file mode 100644
index 000000000..3e48932a3
--- /dev/null
+++ b/meta-oe/recipes-support/guile/files/cpp-linemarkers.patch
@@ -0,0 +1,8 @@
+--- guile.orig/libguile/guile-snarf-docs.in     2009-07-03 18:19:00.000000000 -0400
++++ guile/libguile/guile-snarf-docs.in  2009-11-19 12:55:32.487266268 -0500
+@@ -23,4 +23,4 @@
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
diff --git a/meta-oe/recipes-support/guile/guile-1.8.7/18.diff b/meta-oe/recipes-support/guile/guile-1.8.7/18.diff
new file mode 100644
index 000000000..9c9eefb09
--- /dev/null
+++ b/meta-oe/recipes-support/guile/guile-1.8.7/18.diff
@@ -0,0 +1,1743 @@
+diff --git a/LICENSE b/LICENSE
+index 213e34a..dda451e 100644
+--- a/LICENSE
++++ b/LICENSE
+@@ -1,2 +1,2 @@
+ Guile is covered under the terms of the GNU Lesser General Public
+-License, version 2.1.  See COPYING.LESSER.
++License, version 2.1 or later.  See COPYING.LESSER.
+diff --git a/NEWS b/NEWS
+index 0dcc411..564484f 100644
+--- a/NEWS
++++ b/NEWS
+@@ -5,6 +5,19 @@ See the end for copying conditions.
+ Please send Guile bug reports to bug-guile@gnu.org.
+ 
+ 
++Changes in 1.8.8 (since 1.8.7)
++
++* Bugs fixed
++
++** Fix possible buffer overruns when parsing numbers
++** Avoid clash with system setjmp/longjmp on IA64
++** Don't dynamically link an extension that is already registered
++** Fix `wrong type arg' exceptions with IPv6 addresses
++** Fix typos in `(srfi srfi-19)'
++** Have `(srfi srfi-35)' provide named struct vtables
++** Fix some Interix build problems
++
++
+ Changes in 1.8.7 (since 1.8.6)
+ 
+ * Bugs fixed
+diff --git a/THANKS b/THANKS
+index 47d3cfa..48a105a 100644
+--- a/THANKS
++++ b/THANKS
+@@ -50,6 +50,7 @@ For fixes or providing information which led to a fix:
+          Roland Haeder
+           Sven Hartrumpf
+           Eric Hanchrow
++          Judy Hawkins
+             Sam Hocevar
+        Patrick Horgan
+            Ales Hvezda
+@@ -64,12 +65,15 @@ For fixes or providing information which led to a fix:
+        Matthias Köppe
+            Matt Kraai
+          Daniel Kraft
++            Jay Krell
+            Jeff Long
+          Marco Maggi
+         Gregory Marton
++      Kjetil S. Matheussen
+         Antoine Mathys
+             Dan McMahill
+           Roger Mc Murtrie
++          Scott McPeak
+             Tim Mooney
+         Han-Wen Nienhuys
+             Jan Nieuwenhuizen
+diff --git a/doc/ref/api-modules.texi b/doc/ref/api-modules.texi
+index 9aeb08a..f6393db 100644
+--- a/doc/ref/api-modules.texi
++++ b/doc/ref/api-modules.texi
+@@ -758,7 +758,7 @@ Record definition with @code{define-record-type} (@pxref{SRFI-9}).
+ Read hash extension @code{#,()} (@pxref{SRFI-10}).
+ 
+ @item (srfi srfi-11)
+-Multiple-value handling with @code{let-values} and @code{let-values*}
++Multiple-value handling with @code{let-values} and @code{let*-values}
+ (@pxref{SRFI-11}).
+ 
+ @item (srfi srfi-13)
+diff --git a/doc/ref/guile.texi b/doc/ref/guile.texi
+index 7c17b36..3d9cde4 100644
+--- a/doc/ref/guile.texi
++++ b/doc/ref/guile.texi
+@@ -13,8 +13,8 @@ This reference manual documents Guile, GNU's Ubiquitous Intelligent
+ Language for Extensions.  This is edition @value{MANUAL-EDITION}
+ corresponding to Guile @value{VERSION}.
+ 
+-Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005 Free
+-Software Foundation.
++Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
++2007, 2008, 2009, 2010 Free Software Foundation.
+ 
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2 or
+diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
+index 1cb273a..0a7e342 100644
+--- a/doc/ref/posix.texi
++++ b/doc/ref/posix.texi
+@@ -2310,8 +2310,8 @@ Convert a network address from an integer to a printable string.
+ 
+ @lisp
+ (inet-ntop AF_INET 2130706433) @result{} "127.0.0.1"
+-(inet-ntop AF_INET6 (- (expt 2 128) 1)) @result{}
+-ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
++(inet-ntop AF_INET6 (- (expt 2 128) 1))
++  @result{} "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
+ @end lisp
+ @end deffn
+ 
+@@ -2882,8 +2882,8 @@ same as @code{make-socket-address} would take to make such an object
+ (@pxref{Network Socket Address}).  The return value is unspecified.
+ 
+ @example
+-(connect sock AF_INET INADDR_LOCALHOST 23)
+-(connect sock (make-socket-address AF_INET INADDR_LOCALHOST 23))
++(connect sock AF_INET INADDR_LOOPBACK 23)
++(connect sock (make-socket-address AF_INET INADDR_LOOPBACK 23))
+ @end example
+ @end deffn
+ 
+diff --git a/ice-9/debugging/ice-9-debugger-extensions.scm b/ice-9/debugging/ice-9-debugger-extensions.scm
+index a8b8c97..fe04fc0 100644
+--- a/ice-9/debugging/ice-9-debugger-extensions.scm
++++ b/ice-9/debugging/ice-9-debugger-extensions.scm
+@@ -39,7 +39,8 @@
+       (else
+        (define-module (ice-9 debugger))))
+ 
+-(use-modules (ice-9 debugging steps))
++(use-modules (ice-9 debugging steps)
++             (ice-9 debugging trace))
+ 
+ (define (assert-continuable state)
+   ;; Check that debugger is in a state where `continuing' makes sense.
+diff --git a/libguile/__scm.h b/libguile/__scm.h
+index b198f9d..e75f1a9 100644
+--- a/libguile/__scm.h
++++ b/libguile/__scm.h
+@@ -3,7 +3,7 @@
+ #ifndef SCM___SCM_H
+ #define SCM___SCM_H
+ 
+-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2003, 2006, 2007, 2008 Free Software Foundation, Inc.
++/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2003, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -359,11 +359,9 @@
+ #define SCM_T_INT32_MIN   SCM_I_TYPE_MIN(scm_t_int32,SCM_T_UINT32_MAX)
+ #define SCM_T_INT32_MAX   SCM_I_TYPE_MAX(scm_t_int32,SCM_T_UINT32_MAX)
+ 
+-#if SCM_HAVE_T_INT64
+ #define SCM_T_UINT64_MAX  SCM_I_UTYPE_MAX(scm_t_uint64)
+ #define SCM_T_INT64_MIN   SCM_I_TYPE_MIN(scm_t_int64,SCM_T_UINT64_MAX)
+ #define SCM_T_INT64_MAX   SCM_I_TYPE_MAX(scm_t_int64,SCM_T_UINT64_MAX)
+-#endif
+ 
+ #if SCM_SIZEOF_LONG_LONG
+ #define SCM_I_ULLONG_MAX  SCM_I_UTYPE_MAX(unsigned long long)
+@@ -409,19 +407,28 @@
+     typedef struct {
+       ucontext_t ctx;
+       int fresh;
+-    } jmp_buf;
+-#   define setjmp(JB)                                  \
++    } scm_i_jmp_buf;
++#   define SCM_I_SETJMP(JB)                            \
+       ( (JB).fresh = 1,                                        \
+         getcontext (&((JB).ctx)),                      \
+         ((JB).fresh ? ((JB).fresh = 0, 0) : 1) )
+-#   define longjmp(JB,VAL) scm_ia64_longjmp (&(JB), VAL)
+-    void scm_ia64_longjmp (jmp_buf *, int);
++#   define SCM_I_LONGJMP(JB,VAL) scm_ia64_longjmp (&(JB), VAL)
++    void scm_ia64_longjmp (scm_i_jmp_buf *, int);
+ #  else                        /* ndef __ia64__ */
+ #   include <setjmp.h>
+ #  endif                       /* ndef __ia64__ */
+ # endif                                /* ndef _CRAY1 */
+ #endif                         /* ndef vms */
+ 
++/* For any platform where SCM_I_SETJMP hasn't been defined in some
++   special way above, map SCM_I_SETJMP, SCM_I_LONGJMP and
++   scm_i_jmp_buf to setjmp, longjmp and jmp_buf. */
++#ifndef SCM_I_SETJMP
++#define scm_i_jmp_buf jmp_buf
++#define SCM_I_SETJMP setjmp
++#define SCM_I_LONGJMP longjmp
++#endif
++
+ /* James Clark came up with this neat one instruction fix for
+  * continuations on the SPARC.  It flushes the register windows so
+  * that all the state of the process is contained in the stack.
+diff --git a/libguile/continuations.c b/libguile/continuations.c
+index 69d2569..84a7fed 100644
+--- a/libguile/continuations.c
++++ b/libguile/continuations.c
+@@ -127,7 +127,7 @@ scm_make_continuation (int *first)
+   continuation->offset = continuation->stack - src;
+   memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
+ 
+-  *first = !setjmp (continuation->jmpbuf);
++  *first = !SCM_I_SETJMP (continuation->jmpbuf);
+   if (*first)
+     {
+ #ifdef __ia64__
+@@ -224,12 +224,12 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val,
+   scm_i_set_last_debug_frame (continuation->dframe);
+ 
+   continuation->throw_value = val;
+-  longjmp (continuation->jmpbuf, 1);
++  SCM_I_LONGJMP (continuation->jmpbuf, 1);
+ }
+ 
+ #ifdef __ia64__
+ void
+-scm_ia64_longjmp (jmp_buf *JB, int VAL)
++scm_ia64_longjmp (scm_i_jmp_buf *JB, int VAL)
+ {
+   scm_i_thread *t = SCM_I_CURRENT_THREAD;
+ 
+diff --git a/libguile/continuations.h b/libguile/continuations.h
+index f6fb96a..c61ab2d 100644
+--- a/libguile/continuations.h
++++ b/libguile/continuations.h
+@@ -43,7 +43,7 @@ SCM_API scm_t_bits scm_tc16_continuation;
+ typedef struct 
+ {
+   SCM throw_value;
+-  jmp_buf jmpbuf;
++  scm_i_jmp_buf jmpbuf;
+   SCM dynenv;
+ #ifdef __ia64__
+   void *backing_store;
+diff --git a/libguile/extensions.c b/libguile/extensions.c
+index 1090b8b..29cb58c 100644
+--- a/libguile/extensions.c
++++ b/libguile/extensions.c
+@@ -76,6 +76,7 @@ load_extension (SCM lib, SCM init)
+     {
+       extension_t *ext;
+       char *clib, *cinit;
++      int found = 0;
+ 
+       scm_dynwind_begin (0);
+ 
+@@ -89,10 +90,14 @@ load_extension (SCM lib, SCM init)
+            && !strcmp (ext->init, cinit))
+          {
+            ext->func (ext->data);
++            found = 1;
+            break;
+          }
+ 
+       scm_dynwind_end ();
++
++      if (found)
++        return;
+     }
+ 
+   /* Dynamically link the library. */
+diff --git a/libguile/filesys.c b/libguile/filesys.c
+index 70dfe15..c8acb13 100644
+--- a/libguile/filesys.c
++++ b/libguile/filesys.c
+@@ -23,6 +23,9 @@
+ #ifdef __hpux
+ #define _POSIX_C_SOURCE 199506L  /* for readdir_r */
+ #endif
++#if defined(__INTERIX) && !defined(_REENTRANT)
++# define _REENTRANT   /* ask Interix for readdir_r prototype */
++#endif
+ 
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
+diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
+index 85ebfae..e5de31d 100644
+--- a/libguile/gen-scmconfig.c
++++ b/libguile/gen-scmconfig.c
+@@ -315,28 +315,10 @@ main (int argc, char *argv[])
+     return 1;
+ 
+   pf ("\n");
+-  pf ("/* 64-bit integer -- if available SCM_HAVE_T_INT64 will be 1 and\n"
+-      "   scm_t_int64 will be a suitable type, otherwise SCM_HAVE_T_INT64\n"
+-      "   will be 0. */\n");
+-  if (SCM_I_GSC_T_INT64)
+-  {
+-    pf ("#define SCM_HAVE_T_INT64 1 /* 0 or 1 */\n");
+-    pf ("typedef %s scm_t_int64;\n", SCM_I_GSC_T_INT64);
+-  }
+-  else
+-    pf ("#define SCM_HAVE_T_INT64 0 /* 0 or 1 */\n");
+-
+-  pf ("\n");
+-  pf ("/* 64-bit unsigned integer -- if available SCM_HAVE_T_UINT64 will\n"
+-      "   be 1 and scm_t_uint64 will be a suitable type, otherwise\n"
+-      "   SCM_HAVE_T_UINT64 will be 0. */\n");
+-  if (SCM_I_GSC_T_UINT64)
+-  {
+-    pf ("#define SCM_HAVE_T_UINT64 1 /* 0 or 1 */\n");
+-    pf ("typedef %s scm_t_uint64;\n", SCM_I_GSC_T_UINT64);
+-  }
+-  else
+-    pf ("#define SCM_HAVE_T_UINT64 0 /* 0 or 1 */\n");
++  pf ("#define SCM_HAVE_T_INT64 1 /* 0 or 1 */\n");
++  pf ("typedef %s scm_t_int64;\n", SCM_I_GSC_T_INT64);
++  pf ("#define SCM_HAVE_T_UINT64 1 /* 0 or 1 */\n");
++  pf ("typedef %s scm_t_uint64;\n", SCM_I_GSC_T_UINT64);
+ 
+   pf ("\n");
+   pf ("/* scm_t_ptrdiff_t and size, always defined -- defined to long if\n"
+diff --git a/libguile/hashtab.c b/libguile/hashtab.c
+index ea7fc69..1f1569c 100644
+--- a/libguile/hashtab.c
++++ b/libguile/hashtab.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
++/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2004, 2006, 2008, 2010 Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -911,74 +911,6 @@ SCM_DEFINE (scm_hashx_remove_x, "hashx-remove!", 4, 0, 0,
+ 
+ /* Hash table iterators */
+ 
+-static const char s_scm_hash_fold[];
+-
+-SCM
+-scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table)
+-{
+-  long i, n;
+-  SCM buckets, result = init;
+-  
+-  if (SCM_HASHTABLE_P (table))
+-    buckets = SCM_HASHTABLE_VECTOR (table);
+-  else
+-    buckets = table;
+-  
+-  n = SCM_SIMPLE_VECTOR_LENGTH (buckets);
+-  for (i = 0; i < n; ++i)
+-    {
+-      SCM ls = SCM_SIMPLE_VECTOR_REF (buckets, i), handle;
+-      while (!scm_is_null (ls))
+-       {
+-         if (!scm_is_pair (ls))
+-           scm_wrong_type_arg (s_scm_hash_fold, SCM_ARG3, buckets);
+-         handle = SCM_CAR (ls);
+-         if (!scm_is_pair (handle))
+-           scm_wrong_type_arg (s_scm_hash_fold, SCM_ARG3, buckets);
+-         result = fn (closure, SCM_CAR (handle), SCM_CDR (handle), result);
+-         ls = SCM_CDR (ls);
+-       }
+-    }
+-
+-  return result;
+-}
+-
+-/* The following redundant code is here in order to be able to support
+-   hash-for-each-handle.  An alternative would have been to replace
+-   this code and scm_internal_hash_fold above with a single
+-   scm_internal_hash_fold_handles, but we don't want to promote such
+-   an API. */
+-
+-static const char s_scm_hash_for_each[];
+-
+-void
+-scm_internal_hash_for_each_handle (SCM (*fn) (), void *closure, SCM table)
+-{
+-  long i, n;
+-  SCM buckets;
+-  
+-  if (SCM_HASHTABLE_P (table))
+-    buckets = SCM_HASHTABLE_VECTOR (table);
+-  else
+-    buckets = table;
+-  
+-  n = SCM_SIMPLE_VECTOR_LENGTH (buckets);
+-  for (i = 0; i < n; ++i)
+-    {
+-      SCM ls = SCM_SIMPLE_VECTOR_REF (buckets, i), handle;
+-      while (!scm_is_null (ls))
+-       {
+-         if (!scm_is_pair (ls))
+-           scm_wrong_type_arg (s_scm_hash_for_each, SCM_ARG3, buckets);
+-         handle = SCM_CAR (ls);
+-         if (!scm_is_pair (handle))
+-           scm_wrong_type_arg (s_scm_hash_for_each, SCM_ARG3, buckets);
+-         fn (closure, handle);
+-         ls = SCM_CDR (ls);
+-       }
+-    }
+-}
+-
+ SCM_DEFINE (scm_hash_fold, "hash-fold", 3, 0, 0, 
+             (SCM proc, SCM init, SCM table),
+            "An iterator over hash-table elements.\n"
+@@ -1067,6 +999,72 @@ SCM_DEFINE (scm_hash_map_to_list, "hash-map->list", 2, 0, 0,
+ 
+ 
+ 
++SCM
++scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table)
++{
++  long i, n;
++  SCM buckets, result = init;
++  
++  if (SCM_HASHTABLE_P (table))
++    buckets = SCM_HASHTABLE_VECTOR (table);
++  else
++    buckets = table;
++  
++  n = SCM_SIMPLE_VECTOR_LENGTH (buckets);
++  for (i = 0; i < n; ++i)
++    {
++      SCM ls = SCM_SIMPLE_VECTOR_REF (buckets, i), handle;
++      while (!scm_is_null (ls))
++       {
++         if (!scm_is_pair (ls))
++           scm_wrong_type_arg (s_scm_hash_fold, SCM_ARG3, buckets);
++         handle = SCM_CAR (ls);
++         if (!scm_is_pair (handle))
++           scm_wrong_type_arg (s_scm_hash_fold, SCM_ARG3, buckets);
++         result = fn (closure, SCM_CAR (handle), SCM_CDR (handle), result);
++         ls = SCM_CDR (ls);
++       }
++    }
++
++  return result;
++}
++
++/* The following redundant code is here in order to be able to support
++   hash-for-each-handle.  An alternative would have been to replace
++   this code and scm_internal_hash_fold above with a single
++   scm_internal_hash_fold_handles, but we don't want to promote such
++   an API. */
++
++void
++scm_internal_hash_for_each_handle (SCM (*fn) (), void *closure, SCM table)
++{
++  long i, n;
++  SCM buckets;
++  
++  if (SCM_HASHTABLE_P (table))
++    buckets = SCM_HASHTABLE_VECTOR (table);
++  else
++    buckets = table;
++  
++  n = SCM_SIMPLE_VECTOR_LENGTH (buckets);
++  for (i = 0; i < n; ++i)
++    {
++      SCM ls = SCM_SIMPLE_VECTOR_REF (buckets, i), handle;
++      while (!scm_is_null (ls))
++       {
++         if (!scm_is_pair (ls))
++           scm_wrong_type_arg (s_scm_hash_for_each, SCM_ARG3, buckets);
++         handle = SCM_CAR (ls);
++         if (!scm_is_pair (handle))
++           scm_wrong_type_arg (s_scm_hash_for_each, SCM_ARG3, buckets);
++         fn (closure, handle);
++         ls = SCM_CDR (ls);
++       }
++    }
++}
++
++
++
+ 
+ void
+ scm_hashtab_prehistory ()
+diff --git a/libguile/iselect.h b/libguile/iselect.h
+index 5a4b30d..b23a641 100644
+--- a/libguile/iselect.h
++++ b/libguile/iselect.h
+@@ -38,7 +38,12 @@
+ #ifdef FD_SET
+ 
+ #define SELECT_TYPE fd_set
++#if defined(__INTERIX) && FD_SETSIZE == 4096
++/* Interix defines FD_SETSIZE 4096 but select rejects that. */
++#define SELECT_SET_SIZE 1024
++#else
+ #define SELECT_SET_SIZE FD_SETSIZE
++#endif
+ 
+ #else /* no FD_SET */
+ 
+diff --git a/libguile/numbers.c b/libguile/numbers.c
+index 2e1635f..4f5ab31 100644
+--- a/libguile/numbers.c
++++ b/libguile/numbers.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+  *
+  * Portions Copyright 1990, 1991, 1992, 1993 by AT&T Bell Laboratories
+  * and Bellcore.  See scm_divide.
+@@ -620,7 +620,14 @@ guile_ieee_init (void)
+ #elif HAVE_DINFINITY
+   /* OSF */
+   extern unsigned int DINFINITY[2];
+-  guile_Inf = (*((double *) (DINFINITY)));
++  union
++  {
++    double d;
++    int i[2];
++  } alias;
++  alias.i[0] = DINFINITY[0];
++  alias.i[1] = DINFINITY[1];
++  guile_Inf = alias.d;
+ #else
+   double tmp = 1e+10;
+   guile_Inf = tmp;
+@@ -651,7 +658,14 @@ guile_ieee_init (void)
+   {
+     /* OSF */
+     extern unsigned int DQNAN[2];
+-    guile_NaN = (*((double *)(DQNAN)));
++    union
++    {
++      double d;
++      int i[2];
++    } alias;
++    alias.i[0] = DQNAN[0];
++    alias.i[1] = DQNAN[1];
++    guile_NaN = alias.d;
+   }
+ #else
+   guile_NaN = guile_Inf / guile_Inf;
+@@ -2663,17 +2677,26 @@ mem2decimal_from_point (SCM result, const char* mem, size_t len,
+        case 'l': case 'L':
+        case 's': case 'S':
+          idx++;
++          if (idx == len)
++            return SCM_BOOL_F;
++
+          start = idx;
+          c = mem[idx];
+          if (c == '-')
+            {
+              idx++;
++              if (idx == len)
++                return SCM_BOOL_F;
++
+              sign = -1;
+              c = mem[idx];
+            }
+          else if (c == '+')
+            {
+              idx++;
++              if (idx == len)
++                return SCM_BOOL_F;
++
+              sign = 1;
+              c = mem[idx];
+            }
+@@ -2789,8 +2812,10 @@ mem2ureal (const char* mem, size_t len, unsigned int *p_idx,
+          SCM divisor;
+ 
+          idx++;
++          if (idx == len)
++            return SCM_BOOL_F;
+ 
+-         divisor = mem2uinteger (mem, len, &idx, radix, &x);
++          divisor = mem2uinteger (mem, len, &idx, radix, &x);
+          if (scm_is_false (divisor))
+            return SCM_BOOL_F;
+ 
+@@ -2911,11 +2936,15 @@ mem2complex (const char* mem, size_t len, unsigned int idx,
+              if (c == '+')
+                {
+                  idx++;
++                  if (idx == len)
++                    return SCM_BOOL_F;
+                  sign = 1;
+                }
+              else if (c == '-')
+                {
+                  idx++;
++                  if (idx == len)
++                    return SCM_BOOL_F;
+                  sign = -1;
+                }
+              else
+@@ -5869,8 +5898,6 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
+ #define SCM_FROM_TYPE_PROTO(arg) scm_from_uint32 (arg)
+ #include "libguile/conv-uinteger.i.c"
+ 
+-#if SCM_HAVE_T_INT64
+-
+ #define TYPE                     scm_t_int64
+ #define TYPE_MIN                 SCM_T_INT64_MIN
+ #define TYPE_MAX                 SCM_T_INT64_MAX
+@@ -5887,8 +5914,6 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
+ #define SCM_FROM_TYPE_PROTO(arg) scm_from_uint64 (arg)
+ #include "libguile/conv-uinteger.i.c"
+ 
+-#endif
+-
+ void
+ scm_to_mpz (SCM val, mpz_t rop)
+ {
+diff --git a/libguile/numbers.h b/libguile/numbers.h
+index 2c2fdcf..35263a4 100644
+--- a/libguile/numbers.h
++++ b/libguile/numbers.h
+@@ -3,7 +3,7 @@
+ #ifndef SCM_NUMBERS_H
+ #define SCM_NUMBERS_H
+ 
+-/* Copyright (C) 1995,1996,1998,2000,2001,2002,2003,2004,2005, 2006 Free Software Foundation, Inc.
++/* Copyright (C) 1995,1996,1998,2000,2001,2002,2003,2004,2005, 2006, 2010 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -321,16 +321,12 @@ SCM_API SCM          scm_from_int32  (scm_t_int32 x);
+ SCM_API scm_t_uint32 scm_to_uint32   (SCM x);
+ SCM_API SCM          scm_from_uint32 (scm_t_uint32 x);
+ 
+-#if SCM_HAVE_T_INT64
+-
+ SCM_API scm_t_int64  scm_to_int64    (SCM x);
+ SCM_API SCM          scm_from_int64  (scm_t_int64 x);
+ 
+ SCM_API scm_t_uint64 scm_to_uint64   (SCM x);
+ SCM_API SCM          scm_from_uint64 (scm_t_uint64 x);
+ 
+-#endif
+-
+ SCM_API void scm_to_mpz (SCM x, mpz_t rop);
+ SCM_API SCM  scm_from_mpz (mpz_t rop);
+ 
+diff --git a/libguile/random.c b/libguile/random.c
+index 8d2ff03..693ed4a 100644
+--- a/libguile/random.c
++++ b/libguile/random.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1999,2000,2001, 2003, 2005, 2006 Free Software Foundation, Inc.
++/* Copyright (C) 1999,2000,2001, 2003, 2005, 2006, 2010 Free Software Foundation, Inc.
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+@@ -75,8 +75,6 @@ scm_t_rng scm_the_rng;
+ #define M_PI 3.14159265359
+ #endif
+ 
+-#if SCM_HAVE_T_UINT64
+-
+ unsigned long
+ scm_i_uniform32 (scm_t_i_rstate *state)
+ {
+@@ -87,38 +85,6 @@ scm_i_uniform32 (scm_t_i_rstate *state)
+   return w;
+ }
+ 
+-#else
+-
+-/*     ww  This is a portable version of the same RNG without 64 bit
+- *   * aa  arithmetic.
+- *   ----
+- *     xx  It is only intended to provide identical behaviour on
+- *    xx   platforms without 8 byte longs or long longs until
+- *    xx   someone has implemented the routine in assembler code.
+- *   xxcc
+- *   ----
+- *   ccww
+- */
+-
+-#define L(x) ((x) & 0xffff)
+-#define H(x) ((x) >> 16)
+-
+-unsigned long
+-scm_i_uniform32 (scm_t_i_rstate *state)
+-{
+-  scm_t_uint32 x1 = L (A) * L (state->w);
+-  scm_t_uint32 x2 = L (A) * H (state->w);
+-  scm_t_uint32 x3 = H (A) * L (state->w);
+-  scm_t_uint32 w = L (x1) + L (state->c);
+-  scm_t_uint32 m = H (x1) + L (x2) + L (x3) + H (state->c) + H (w);
+-  scm_t_uint32 x4 = H (A) * H (state->w);
+-  state->w = w = (L (m) << 16) + L (w);
+-  state->c = H (x2) + H (x3) + x4 + H (m);
+-  return w;
+-}
+-
+-#endif
+-
+ void
+ scm_i_init_rstate (scm_t_i_rstate *state, const char *seed, int n)
+ {
+@@ -212,21 +178,49 @@ scm_c_exp1 (scm_t_rstate *state)
+ 
+ unsigned char scm_masktab[256];
+ 
+-unsigned long
+-scm_c_random (scm_t_rstate *state, unsigned long m)
++static inline scm_t_uint32
++scm_i_mask32 (scm_t_uint32 m)
+ {
+-  unsigned int r, mask;
+-  mask = (m < 0x100
++  return (m < 0x100
+          ? scm_masktab[m]
+          : (m < 0x10000
+             ? scm_masktab[m >> 8] << 8 | 0xff
+             : (m < 0x1000000
+                ? scm_masktab[m >> 16] << 16 | 0xffff
+                : scm_masktab[m >> 24] << 24 | 0xffffff)));
++}
++
++static scm_t_uint32
++scm_c_random32 (scm_t_rstate *state, scm_t_uint32 m)
++{
++  scm_t_uint32 r, mask = scm_i_mask32 (m);
+   while ((r = scm_the_rng.random_bits (state) & mask) >= m);
+   return r;
+ }
+ 
++/* Returns 32 random bits. */
++unsigned long
++scm_c_random (scm_t_rstate *state, unsigned long m)
++{
++  return scm_c_random32 (state, (scm_t_uint32)m);
++}
++
++scm_t_uint64
++scm_c_random64 (scm_t_rstate *state, scm_t_uint64 m)
++{
++  scm_t_uint64 r;
++  scm_t_uint32 mask;
++
++  if (m <= SCM_T_UINT32_MAX)
++    return scm_c_random32 (state, (scm_t_uint32) m);
++  
++  mask = scm_i_mask32 (m >> 32);
++  while ((r = ((scm_t_uint64) (scm_the_rng.random_bits (state) & mask) << 32)
++          | scm_the_rng.random_bits (state)) >= m)
++    ;
++  return r;
++}
++
+ /*
+   SCM scm_c_random_bignum (scm_t_rstate *state, SCM m)
+ 
+@@ -247,24 +241,24 @@ scm_c_random_bignum (scm_t_rstate *state, SCM m)
+ {
+   SCM result = scm_i_mkbig ();
+   const size_t m_bits = mpz_sizeinbase (SCM_I_BIG_MPZ (m), 2);
+-  /* how many bits would only partially fill the last unsigned long? */
+-  const size_t end_bits = m_bits % (sizeof (unsigned long) * SCM_CHAR_BIT);
+-  unsigned long *random_chunks = NULL;
+-  const unsigned long num_full_chunks =
+-    m_bits / (sizeof (unsigned long) * SCM_CHAR_BIT);
+-  const unsigned long num_chunks = num_full_chunks + ((end_bits) ? 1 : 0);
++  /* how many bits would only partially fill the last u32? */
++  const size_t end_bits = m_bits % (sizeof (scm_t_uint32) * SCM_CHAR_BIT);
++  scm_t_uint32 *random_chunks = NULL;
++  const scm_t_uint32 num_full_chunks =
++    m_bits / (sizeof (scm_t_uint32) * SCM_CHAR_BIT);
++  const scm_t_uint32 num_chunks = num_full_chunks + ((end_bits) ? 1 : 0);
+ 
+   /* we know the result will be this big */
+   mpz_realloc2 (SCM_I_BIG_MPZ (result), m_bits);
+ 
+   random_chunks =
+-    (unsigned long *) scm_gc_calloc (num_chunks * sizeof (unsigned long),
++    (scm_t_uint32 *) scm_gc_calloc (num_chunks * sizeof (scm_t_uint32),
+                                      "random bignum chunks");
+ 
+   do
+     {
+-      unsigned long *current_chunk = random_chunks + (num_chunks - 1);
+-      unsigned long chunks_left = num_chunks;
++      scm_t_uint32 *current_chunk = random_chunks + (num_chunks - 1);
++      scm_t_uint32 chunks_left = num_chunks;
+ 
+       mpz_set_ui (SCM_I_BIG_MPZ (result), 0);
+       
+@@ -273,23 +267,23 @@ scm_c_random_bignum (scm_t_rstate *state, SCM m)
+           /* generate a mask with ones in the end_bits position, i.e. if
+              end_bits is 3, then we'd have a mask of ...0000000111 */
+           const unsigned long rndbits = scm_the_rng.random_bits (state);
+-          int rshift = (sizeof (unsigned long) * SCM_CHAR_BIT) - end_bits;
+-          unsigned long mask = ((unsigned long) ULONG_MAX) >> rshift;
+-          unsigned long highest_bits = rndbits & mask;
++          int rshift = (sizeof (scm_t_uint32) * SCM_CHAR_BIT) - end_bits;
++          scm_t_uint32 mask = 0xffffffff >> rshift;
++          scm_t_uint32 highest_bits = ((scm_t_uint32) rndbits) & mask;
+           *current_chunk-- = highest_bits;
+           chunks_left--;
+         }
+       
+       while (chunks_left)
+         {
+-          /* now fill in the remaining unsigned long sized chunks */
++          /* now fill in the remaining scm_t_uint32 sized chunks */
+           *current_chunk-- = scm_the_rng.random_bits (state);
+           chunks_left--;
+         }
+       mpz_import (SCM_I_BIG_MPZ (result),
+                   num_chunks,
+                   -1,
+-                  sizeof (unsigned long),
++                  sizeof (scm_t_uint32),
+                   0,
+                   0,
+                   random_chunks);
+@@ -297,7 +291,7 @@ scm_c_random_bignum (scm_t_rstate *state, SCM m)
+         all bits in order not to get a distorted distribution) */
+     } while (mpz_cmp (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (m)) >= 0);
+   scm_gc_free (random_chunks,
+-               num_chunks * sizeof (unsigned long),
++               num_chunks * sizeof (scm_t_uint32),
+                "random bignum chunks");
+   return scm_i_normbig (result);
+ }
+@@ -348,9 +342,17 @@ SCM_DEFINE (scm_random, "random", 1, 1, 0,
+   SCM_VALIDATE_RSTATE (2, state);
+   if (SCM_I_INUMP (n))
+     {
+-      unsigned long m = SCM_I_INUM (n);
+-      SCM_ASSERT_RANGE (1, n, m > 0);
+-      return scm_from_ulong (scm_c_random (SCM_RSTATE (state), m));
++      unsigned long m = (unsigned long) SCM_I_INUM (n);
++      SCM_ASSERT_RANGE (1, n, SCM_I_INUM (n) > 0);
++#if SCM_SIZEOF_UNSIGNED_LONG <= 4
++      return scm_from_uint32 (scm_c_random (SCM_RSTATE (state),
++                                            (scm_t_uint32) m));
++#elif SCM_SIZEOF_UNSIGNED_LONG <= 8
++      return scm_from_uint64 (scm_c_random64 (SCM_RSTATE (state),
++                                              (scm_t_uint64) m));
++#else
++#error "Cannot deal with this platform's unsigned long size"
++#endif
+     }
+   SCM_VALIDATE_NIM (1, n);
+   if (SCM_REALP (n))
+diff --git a/libguile/random.h b/libguile/random.h
+index 6ec43ff..0690b59 100644
+--- a/libguile/random.h
++++ b/libguile/random.h
+@@ -3,7 +3,7 @@
+ #ifndef SCM_RANDOM_H
+ #define SCM_RANDOM_H
+ 
+-/* Copyright (C) 1999,2000,2001, 2006 Free Software Foundation, Inc.
++/* Copyright (C) 1999,2000,2001, 2006, 2010 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -45,6 +45,7 @@ typedef struct scm_t_rstate {
+ 
+ typedef struct scm_t_rng {
+   size_t rstate_size;                              /* size of random state */
++  /* Though this returns an unsigned long, it's only 32 bits of randomness. */
+   unsigned long (*random_bits) (scm_t_rstate *state); /* gives 32 random bits */
+   void (*init_rstate) (scm_t_rstate *state, const char *seed, int n);
+   scm_t_rstate *(*copy_rstate) (scm_t_rstate *state);
+@@ -62,6 +63,7 @@ typedef struct scm_t_i_rstate {
+   unsigned long c;
+ } scm_t_i_rstate;
+ 
++/* Though this returns an unsigned long, it's only 32 bits of randomness. */
+ SCM_API unsigned long scm_i_uniform32 (scm_t_i_rstate *);
+ SCM_API void scm_i_init_rstate (scm_t_i_rstate *, const char *seed, int n);
+ SCM_API scm_t_i_rstate *scm_i_copy_rstate (scm_t_i_rstate *);
+@@ -76,7 +78,10 @@ SCM_API scm_t_rstate *scm_c_default_rstate (void);
+ SCM_API double scm_c_uniform01 (scm_t_rstate *);
+ SCM_API double scm_c_normal01 (scm_t_rstate *);
+ SCM_API double scm_c_exp1 (scm_t_rstate *);
++/* Though this returns an unsigned long, it's only 32 bits of randomness. */
+ SCM_API unsigned long scm_c_random (scm_t_rstate *, unsigned long m);
++/* This one returns 64 bits of randomness. */
++SCM_API scm_t_uint64 scm_c_random64 (scm_t_rstate *state, scm_t_uint64 m);
+ SCM_API SCM scm_c_random_bignum (scm_t_rstate *, SCM m);
+ 
+ 
+diff --git a/libguile/socket.c b/libguile/socket.c
+index f34b6d4..cb954f4 100644
+--- a/libguile/socket.c
++++ b/libguile/socket.c
+@@ -347,7 +347,7 @@ scm_to_ipv6 (scm_t_uint8 dst[16], SCM src)
+       scm_remember_upto_here_1 (src);
+     }
+   else
+-    scm_wrong_type_arg (NULL, 0, src);
++    scm_wrong_type_arg_msg ("scm_to_ipv6", 0, src, "integer");
+ }
+ 
+ #ifdef HAVE_INET_PTON
+@@ -397,8 +397,8 @@ SCM_DEFINE (scm_inet_ntop, "inet-ntop", 2, 0, 0,
+            "@var{family} can be @code{AF_INET} or @code{AF_INET6}.  E.g.,\n\n"
+            "@lisp\n"
+            "(inet-ntop AF_INET 2130706433) @result{} \"127.0.0.1\"\n"
+-           "(inet-ntop AF_INET6 (- (expt 2 128) 1)) @result{}\n"
+-           "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\n"
++           "(inet-ntop AF_INET6 (- (expt 2 128) 1))\n"
++           "  @result{} \"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\"\n"
+            "@end lisp")
+ #define FUNC_NAME s_scm_inet_ntop
+ {
+@@ -1167,7 +1167,8 @@ scm_to_sockaddr (SCM address, size_t *address_size)
+          {
+            struct sockaddr_in6 c_inet6;
+ 
+-           scm_to_ipv6 (c_inet6.sin6_addr.s6_addr, address);
++           scm_to_ipv6 (c_inet6.sin6_addr.s6_addr,
++                        SCM_SIMPLE_VECTOR_REF (address, 1));
+            c_inet6.sin6_port =
+              htons (scm_to_ushort (SCM_SIMPLE_VECTOR_REF (address, 2)));
+            c_inet6.sin6_flowinfo =
+diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
+index b0e052a..f2a9d7f 100644
+--- a/libguile/srfi-4.c
++++ b/libguile/srfi-4.c
+@@ -1,6 +1,6 @@
+ /* srfi-4.c --- Uniform numeric vector datatypes.
+  *
+- *     Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
++ *     Copyright (C) 2001, 2004, 2006, 2010 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -84,11 +84,7 @@ static const int uvec_sizes[12] = {
+   1, 1,
+   2, 2,
+   4, 4,
+-#if SCM_HAVE_T_INT64
+   8, 8,
+-#else
+-  sizeof (SCM), sizeof (SCM),
+-#endif
+   sizeof(float), sizeof(double),
+   2*sizeof(float), 2*sizeof(double)
+ };
+@@ -127,10 +123,8 @@ uvec_print (SCM uvec, SCM port, scm_print_state *pstate)
+     scm_t_int16 *s16;
+     scm_t_uint32 *u32;
+     scm_t_int32 *s32;
+-#if SCM_HAVE_T_INT64
+     scm_t_uint64 *u64;
+     scm_t_int64 *s64;
+-#endif
+     float *f32;
+     double *f64;
+     SCM *fake_64;
+@@ -148,13 +142,8 @@ uvec_print (SCM uvec, SCM port, scm_print_state *pstate)
+     case SCM_UVEC_S16: np.s16 = (scm_t_int16 *) uptr; break;
+     case SCM_UVEC_U32: np.u32 = (scm_t_uint32 *) uptr; break;
+     case SCM_UVEC_S32: np.s32 = (scm_t_int32 *) uptr; break;
+-#if SCM_HAVE_T_INT64
+     case SCM_UVEC_U64: np.u64 = (scm_t_uint64 *) uptr; break;
+     case SCM_UVEC_S64: np.s64 = (scm_t_int64 *) uptr; break;
+-#else
+-    case SCM_UVEC_U64:
+-    case SCM_UVEC_S64: np.fake_64 = (SCM *) uptr; break;
+-#endif      
+     case SCM_UVEC_F32: np.f32 = (float *) uptr; break;
+     case SCM_UVEC_F64: np.f64 = (double *) uptr; break;
+     case SCM_UVEC_C32: np.f32 = (float *) uptr; break;
+@@ -179,14 +168,8 @@ uvec_print (SCM uvec, SCM port, scm_print_state *pstate)
+        case SCM_UVEC_S16: scm_intprint (*np.s16, 10, port); np.s16++; break;
+        case SCM_UVEC_U32: scm_uintprint (*np.u32, 10, port); np.u32++; break;
+        case SCM_UVEC_S32: scm_intprint (*np.s32, 10, port); np.s32++; break;
+-#if SCM_HAVE_T_INT64
+        case SCM_UVEC_U64: scm_uintprint (*np.u64, 10, port); np.u64++; break;
+        case SCM_UVEC_S64: scm_intprint (*np.s64, 10, port); np.s64++; break;
+-#else
+-       case SCM_UVEC_U64:
+-       case SCM_UVEC_S64: scm_iprin1 (*np.fake_64, port, pstate);
+-         np.fake_64++; break;
+-#endif
+        case SCM_UVEC_F32: scm_i_print_double (*np.f32, port); np.f32++; break;
+        case SCM_UVEC_F64: scm_i_print_double (*np.f64, port); np.f64++; break;
+        case SCM_UVEC_C32:
+@@ -222,20 +205,6 @@ uvec_equalp (SCM a, SCM b)
+     result = SCM_BOOL_F;
+   else if (SCM_UVEC_LENGTH (a) != SCM_UVEC_LENGTH (b))
+     result = SCM_BOOL_F;
+-#if SCM_HAVE_T_INT64 == 0
+-  else if (SCM_UVEC_TYPE (a) == SCM_UVEC_U64
+-          || SCM_UVEC_TYPE (a) == SCM_UVEC_S64)
+-    {
+-      SCM *aptr = (SCM *)SCM_UVEC_BASE (a), *bptr = (SCM *)SCM_UVEC_BASE (b);
+-      size_t len = SCM_UVEC_LENGTH (a), i;
+-      for (i = 0; i < len; i++)
+-       if (scm_is_false (scm_num_eq_p (*aptr++, *bptr++)))
+-         {
+-           result = SCM_BOOL_F;
+-           break;
+-         }
+-    }
+-#endif
+   else if (memcmp (SCM_UVEC_BASE (a), SCM_UVEC_BASE (b),
+                   SCM_UVEC_LENGTH (a) * uvec_sizes[SCM_UVEC_TYPE(a)]) != 0)
+     result = SCM_BOOL_F;
+@@ -244,24 +213,6 @@ uvec_equalp (SCM a, SCM b)
+   return result;
+ }
+ 
+-/* Mark hook.  Only used when U64 and S64 are implemented as SCMs. */
+-
+-#if SCM_HAVE_T_INT64 == 0
+-static SCM
+-uvec_mark (SCM uvec)
+-{
+-  if (SCM_UVEC_TYPE (uvec) == SCM_UVEC_U64
+-      || SCM_UVEC_TYPE (uvec) == SCM_UVEC_S64)
+-    {
+-      SCM *ptr = (SCM *)SCM_UVEC_BASE (uvec);
+-      size_t len = SCM_UVEC_LENGTH (uvec), i;
+-      for (i = 0; i < len; i++)
+-       scm_gc_mark (*ptr++);
+-    }
+-  return SCM_BOOL_F;
+-}
+-#endif
+-
+ /* Smob free hook for uniform numeric vectors. */
+ static size_t
+ uvec_free (SCM uvec)
+@@ -318,15 +269,6 @@ alloc_uvec (int type, size_t len)
+   if (len > SCM_I_SIZE_MAX / uvec_sizes[type])
+     scm_out_of_range (NULL, scm_from_size_t (len));
+   base = scm_gc_malloc (len * uvec_sizes[type], uvec_names[type]);
+-#if SCM_HAVE_T_INT64 == 0
+-  if (type == SCM_UVEC_U64 || type == SCM_UVEC_S64)
+-    {
+-      SCM *ptr = (SCM *)base;
+-      size_t i;
+-      for (i = 0; i < len; i++)
+-       *ptr++ = SCM_UNSPECIFIED;
+-    }
+-#endif
+   return take_uvec (type, base, len);
+ }
+ 
+@@ -349,17 +291,10 @@ uvec_fast_ref (int type, const void *base, size_t c_idx)
+     return scm_from_uint32 (((scm_t_uint32*)base)[c_idx]);
+   else if (type == SCM_UVEC_S32)
+     return scm_from_int32 (((scm_t_int32*)base)[c_idx]);
+-#if SCM_HAVE_T_INT64
+   else if (type == SCM_UVEC_U64)
+     return scm_from_uint64 (((scm_t_uint64*)base)[c_idx]);
+   else if (type == SCM_UVEC_S64)
+     return scm_from_int64 (((scm_t_int64*)base)[c_idx]);
+-#else
+-  else if (type == SCM_UVEC_U64)
+-    return ((SCM *)base)[c_idx];
+-  else if (type == SCM_UVEC_S64)
+-    return ((SCM *)base)[c_idx];
+-#endif
+   else if (type == SCM_UVEC_F32)
+     return scm_from_double (((float*)base)[c_idx]);
+   else if (type == SCM_UVEC_F64)
+@@ -374,22 +309,6 @@ uvec_fast_ref (int type, const void *base, size_t c_idx)
+     return SCM_BOOL_F;
+ }
+ 
+-#if SCM_HAVE_T_INT64 == 0
+-static SCM scm_uint64_min, scm_uint64_max;
+-static SCM scm_int64_min, scm_int64_max;
+-
+-static void
+-assert_exact_integer_range (SCM val, SCM min, SCM max)
+-{
+-  if (!scm_is_integer (val)
+-      || scm_is_false (scm_exact_p (val)))
+-    scm_wrong_type_arg_msg (NULL, 0, val, "exact integer");
+-  if (scm_is_true (scm_less_p (val, min))
+-      || scm_is_true (scm_gr_p (val, max)))
+-    scm_out_of_range (NULL, val);
+-}
+-#endif
+-
+ static SCM_C_INLINE_KEYWORD void
+ uvec_fast_set_x (int type, void *base, size_t c_idx, SCM val)
+ {
+@@ -405,23 +324,10 @@ uvec_fast_set_x (int type, void *base, size_t c_idx, SCM val)
+     (((scm_t_uint32*)base)[c_idx]) = scm_to_uint32 (val);
+   else if (type == SCM_UVEC_S32)
+     (((scm_t_int32*)base)[c_idx]) = scm_to_int32 (val);
+-#if SCM_HAVE_T_INT64
+   else if (type == SCM_UVEC_U64)
+     (((scm_t_uint64*)base)[c_idx]) = scm_to_uint64 (val);
+   else if (type == SCM_UVEC_S64)
+     (((scm_t_int64*)base)[c_idx]) = scm_to_int64 (val);
+-#else
+-  else if (type == SCM_UVEC_U64)
+-    {
+-      assert_exact_integer_range (val, scm_uint64_min, scm_uint64_max);
+-      ((SCM *)base)[c_idx] = val;
+-    }
+-  else if (type == SCM_UVEC_S64)
+-    {
+-      assert_exact_integer_range (val, scm_int64_min, scm_int64_max);
+-      ((SCM *)base)[c_idx] = val;
+-    }
+-#endif
+   else if (type == SCM_UVEC_F32)
+     (((float*)base)[c_idx]) = scm_to_double (val);
+   else if (type == SCM_UVEC_F64)
+@@ -1027,16 +933,12 @@ SCM_DEFINE (scm_uniform_vector_write, "uniform-vector-write", 1, 3, 0,
+ 
+ #define TYPE  SCM_UVEC_U64
+ #define TAG   u64
+-#if SCM_HAVE_T_UINT64
+ #define CTYPE scm_t_uint64
+-#endif
+ #include "libguile/srfi-4.i.c"
+ 
+ #define TYPE  SCM_UVEC_S64
+ #define TAG   s64
+-#if SCM_HAVE_T_INT64
+ #define CTYPE scm_t_int64
+-#endif
+ #include "libguile/srfi-4.i.c"
+ 
+ #define TYPE  SCM_UVEC_F32
+@@ -1094,23 +996,9 @@ scm_init_srfi_4 (void)
+ {
+   scm_tc16_uvec = scm_make_smob_type ("uvec", 0);
+   scm_set_smob_equalp (scm_tc16_uvec, uvec_equalp);
+-#if SCM_HAVE_T_INT64 == 0
+-  scm_set_smob_mark (scm_tc16_uvec, uvec_mark);
+-#endif
+   scm_set_smob_free (scm_tc16_uvec, uvec_free);
+   scm_set_smob_print (scm_tc16_uvec, uvec_print);
+ 
+-#if SCM_HAVE_T_INT64 == 0
+-  scm_uint64_min =
+-    scm_permanent_object (scm_from_int (0));
+-  scm_uint64_max =
+-    scm_permanent_object (scm_c_read_string ("18446744073709551615"));
+-  scm_int64_min =
+-    scm_permanent_object (scm_c_read_string ("-9223372036854775808"));
+-  scm_int64_max =
+-    scm_permanent_object (scm_c_read_string ("9223372036854775807"));
+-#endif
+-
+ #include "libguile/srfi-4.x"
+ 
+ }
+diff --git a/libguile/srfi-4.h b/libguile/srfi-4.h
+index 7abbac8..2348c5a 100644
+--- a/libguile/srfi-4.h
++++ b/libguile/srfi-4.h
+@@ -2,7 +2,7 @@
+ #define SCM_SRFI_4_H
+ /* srfi-4.c --- Homogeneous numeric vector datatypes.
+  *
+- *     Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
++ *     Copyright (C) 2001, 2004, 2006, 2010 Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -186,7 +186,6 @@ SCM_API SCM scm_u64vector_to_list (SCM uvec);
+ SCM_API SCM scm_list_to_u64vector (SCM l);
+ SCM_API SCM scm_any_to_u64vector (SCM obj);
+ 
+-#if SCM_HAVE_T_UINT64
+ SCM_API SCM scm_take_u64vector (scm_t_uint64 *data, size_t n);
+ SCM_API const scm_t_uint64 *scm_array_handle_u64_elements (scm_t_array_handle *h);
+ SCM_API scm_t_uint64 *scm_array_handle_u64_writable_elements (scm_t_array_handle *h);
+@@ -198,7 +197,6 @@ SCM_API scm_t_uint64 *scm_u64vector_writable_elements (SCM uvec,
+                                                       scm_t_array_handle *h,
+                                                       size_t *lenp,
+                                                       ssize_t *incp);
+-#endif
+ 
+ SCM_API SCM scm_s64vector_p (SCM obj);
+ SCM_API SCM scm_make_s64vector (SCM n, SCM fill);
+@@ -210,7 +208,6 @@ SCM_API SCM scm_s64vector_to_list (SCM uvec);
+ SCM_API SCM scm_list_to_s64vector (SCM l);
+ SCM_API SCM scm_any_to_s64vector (SCM obj);
+ 
+-#if SCM_HAVE_T_INT64
+ SCM_API SCM scm_take_s64vector (scm_t_int64 *data, size_t n);
+ SCM_API const scm_t_int64 *scm_array_handle_s64_elements (scm_t_array_handle *h);
+ SCM_API scm_t_int64 *scm_array_handle_s64_writable_elements (scm_t_array_handle *h);
+@@ -221,7 +218,6 @@ SCM_API scm_t_int64 *scm_s64vector_writable_elements (SCM uvec,
+                                                      scm_t_array_handle *h,
+                                                      size_t *lenp,
+                                                      ssize_t *incp);
+-#endif
+ 
+ SCM_API SCM scm_f32vector_p (SCM obj);
+ SCM_API SCM scm_make_f32vector (SCM n, SCM fill);
+diff --git a/libguile/threads.c b/libguile/threads.c
+index 95a905c..f2bb556 100644
+--- a/libguile/threads.c
++++ b/libguile/threads.c
+@@ -276,7 +276,7 @@ unblock_from_queue (SCM queue)
+       var 't'
+       // save registers.
+       SCM_FLUSH_REGISTER_WINDOWS;      // sparc only
+-      setjmp (t->regs);                // here's most of the magic
++      SCM_I_SETJMP (t->regs);          // here's most of the magic
+ 
+    ... and returns.
+ 
+@@ -330,7 +330,7 @@ unblock_from_queue (SCM queue)
+       t->top = SCM_STACK_PTR (&t);
+       // save registers.
+       SCM_FLUSH_REGISTER_WINDOWS;
+-      setjmp (t->regs);
++      SCM_I_SETJMP (t->regs);
+       res = func(data);
+       scm_enter_guile (t);
+ 
+@@ -388,7 +388,7 @@ suspend (void)
+   t->top = SCM_STACK_PTR (&t);
+   /* save registers. */
+   SCM_FLUSH_REGISTER_WINDOWS;
+-  setjmp (t->regs);
++  SCM_I_SETJMP (t->regs);
+   return t;
+ }
+ 
+diff --git a/libguile/threads.h b/libguile/threads.h
+index 2b0e067..e22d9bd 100644
+--- a/libguile/threads.h
++++ b/libguile/threads.h
+@@ -107,7 +107,7 @@ typedef struct scm_i_thread {
+   /* For keeping track of the stack and registers. */
+   SCM_STACKITEM *base;
+   SCM_STACKITEM *top;
+-  jmp_buf regs;
++  scm_i_jmp_buf regs;
+ #ifdef __ia64__
+   void *register_backing_store_base;
+   scm_t_contregs *pending_rbs_continuation;
+diff --git a/libguile/throw.c b/libguile/throw.c
+index 92c5a1a..fcfde47 100644
+--- a/libguile/throw.c
++++ b/libguile/throw.c
+@@ -53,7 +53,7 @@ static scm_t_bits tc16_jmpbuffer;
+ #define DEACTIVATEJB(x) \
+   (SCM_SET_CELL_WORD_0 ((x), (SCM_CELL_WORD_0 (x) & ~(1L << 16L))))
+ 
+-#define JBJMPBUF(OBJ)           ((jmp_buf *) SCM_CELL_WORD_1 (OBJ))
++#define JBJMPBUF(OBJ)           ((scm_i_jmp_buf *) SCM_CELL_WORD_1 (OBJ))
+ #define SETJBJMPBUF(x, v)        (SCM_SET_CELL_WORD_1 ((x), (scm_t_bits) (v)))
+ #define SCM_JBDFRAME(x)         ((scm_t_debug_frame *) SCM_CELL_WORD_2 (x))
+ #define SCM_SETJBDFRAME(x, v)    (SCM_SET_CELL_WORD_2 ((x), (scm_t_bits) (v)))
+@@ -75,7 +75,7 @@ make_jmpbuf (void)
+ {
+   SCM answer;
+   SCM_NEWSMOB2 (answer, tc16_jmpbuffer, 0, 0);
+-  SETJBJMPBUF(answer, (jmp_buf *)0);
++  SETJBJMPBUF(answer, (scm_i_jmp_buf *)0);
+   DEACTIVATEJB(answer);
+   return answer;
+ }
+@@ -85,7 +85,7 @@ make_jmpbuf (void)
+ 
+ struct jmp_buf_and_retval      /* use only on the stack, in scm_catch */
+ {
+-  jmp_buf buf;                 /* must be first */
++  scm_i_jmp_buf buf;           /* must be first */
+   SCM throw_tag;
+   SCM retval;
+ };
+@@ -179,7 +179,7 @@ scm_c_catch (SCM tag,
+   pre_unwind.lazy_catch_p = 0;
+   SCM_SETJBPREUNWIND(jmpbuf, &pre_unwind);
+ 
+-  if (setjmp (jbr.buf))
++  if (SCM_I_SETJMP (jbr.buf))
+     {
+       SCM throw_tag;
+       SCM throw_args;
+@@ -821,7 +821,7 @@ scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED)
+       jbr->throw_tag = key;
+       jbr->retval = args;
+       scm_i_set_last_debug_frame (SCM_JBDFRAME (jmpbuf));
+-      longjmp (*JBJMPBUF (jmpbuf), 1);
++      SCM_I_LONGJMP (*JBJMPBUF (jmpbuf), 1);
+     }
+ 
+   /* Otherwise, it's some random piece of junk.  */
+diff --git a/libguile/vectors.c b/libguile/vectors.c
+index eeb8569..074655c 100644
+--- a/libguile/vectors.c
++++ b/libguile/vectors.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2006, 2008 Free Software Foundation, Inc.
++/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2006, 2008, 2010 Free Software Foundation, Inc.
+  * 
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -465,7 +465,9 @@ SCM_DEFINE (scm_vector_move_left_x, "vector-move-left!", 5, 0, 0,
+ 
+   i = scm_to_unsigned_integer (start1, 0, len1);
+   e = scm_to_unsigned_integer (end1, i, len1);
+-  j = scm_to_unsigned_integer (start2, 0, len2 - (i-e));
++  SCM_ASSERT_RANGE (SCM_ARG3, end1, (e-i) < len2);
++  j = scm_to_unsigned_integer (start2, 0, len2);
++  SCM_ASSERT_RANGE (SCM_ARG5, start2, j <= len2 - (e - i));
+   
+   i *= inc1;
+   e *= inc1;
+@@ -503,7 +505,11 @@ SCM_DEFINE (scm_vector_move_right_x, "vector-move-right!", 5, 0, 0,
+ 
+   i = scm_to_unsigned_integer (start1, 0, len1);
+   e = scm_to_unsigned_integer (end1, i, len1);
+-  j = scm_to_unsigned_integer (start2, 0, len2 - (i-e));
++  SCM_ASSERT_RANGE (SCM_ARG3, end1, (e-i) < len2);
++  j = scm_to_unsigned_integer (start2, 0, len2);
++  SCM_ASSERT_RANGE (SCM_ARG5, start2, j <= len2 - (e - i));
++  
++  j += (e - i);
+   
+   i *= inc1;
+   e *= inc1;
+diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi
+index ea33e17..8cd42e8 100755
+--- a/scripts/snarf-check-and-output-texi
++++ b/scripts/snarf-check-and-output-texi
+@@ -267,6 +267,17 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
+       (set! *file* file)
+       (set! *line* line))
+ 
++     ;; newer gccs like to throw around more location markers into the
++     ;; preprocessed source; these (hash . hash) bits are what they translate to
++     ;; in snarfy terms.
++     (('location ('string . file) ('int . line) ('hash . 'hash))
++      (set! *file* file)
++      (set! *line* line))
++
++     (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash))
++      (set! *file* file)
++      (set! *line* line))
++
+      (('arglist rest ...)
+       (set! *args* (do-arglist rest)))
+ 
+diff --git a/srfi/srfi-19.scm b/srfi/srfi-19.scm
+index ffce990..482ec4e 100644
+--- a/srfi/srfi-19.scm
++++ b/srfi/srfi-19.scm
+@@ -1,6 +1,6 @@
+ ;;; srfi-19.scm --- Time/Date Library
+ 
+-;;     Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++;;     Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ ;;
+ ;; This library is free software; you can redistribute it and/or
+ ;; modify it under the terms of the GNU Lesser General Public
+@@ -41,7 +41,8 @@
+ (define-module (srfi srfi-19)
+   :use-module (srfi srfi-6)
+   :use-module (srfi srfi-8)
+-  :use-module (srfi srfi-9))
++  :use-module (srfi srfi-9)
++  :autoload   (ice-9 rdelim) (read-line))
+ 
+ (begin-deprecated
+  ;; Prevent `export' from re-exporting core bindings.  This behaviour
+@@ -339,7 +340,7 @@
+     (set-tm:hour result (date-hour date))
+     ;; FIXME: SRFI day ranges from 0-31.  (not compatible with set-tm:mday).
+     (set-tm:mday result (date-day date))
+-    (set-tm:month result (- (date-month date) 1))
++    (set-tm:mon result (- (date-month date) 1))
+     ;; FIXME: need to signal error on range violation.
+     (set-tm:year result (+ 1900 (date-year date)))
+     (set-tm:isdst result -1)
+@@ -528,33 +529,38 @@
+ ;; -- these depend on time-monotonic having the same definition as time-tai!
+ (define (time-monotonic->time-utc time-in)
+   (if (not (eq? (time-type time-in) time-monotonic))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-monotonic->time-utc
++                       'incompatible-time-types time-in))
+   (let ((ntime (copy-time time-in)))
+     (set-time-type! ntime time-tai)
+     (priv:time-tai->time-utc! ntime ntime 'time-monotonic->time-utc)))
+ 
+ (define (time-monotonic->time-utc! time-in)
+   (if (not (eq? (time-type time-in) time-monotonic))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-monotonic->time-utc!
++                       'incompatible-time-types time-in))
+   (set-time-type! time-in time-tai)
+-  (priv:time-tai->time-utc! ntime ntime 'time-monotonic->time-utc))
++  (priv:time-tai->time-utc! time-in time-in 'time-monotonic->time-utc))
+ 
+ (define (time-monotonic->time-tai time-in)
+   (if (not (eq? (time-type time-in) time-monotonic))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-monotonic->time-tai
++                       'incompatible-time-types time-in))
+   (let ((ntime (copy-time time-in)))
+     (set-time-type! ntime time-tai)
+     ntime))
+ 
+ (define (time-monotonic->time-tai! time-in)
+   (if (not (eq? (time-type time-in) time-monotonic))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-monotonic->time-tai!
++                       'incompatible-time-types time-in))
+   (set-time-type! time-in time-tai)
+   time-in)
+ 
+ (define (time-utc->time-monotonic time-in)
+   (if (not (eq? (time-type time-in) time-utc))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-utc->time-monotonic
++                       'incompatible-time-types time-in))
+   (let ((ntime (priv:time-utc->time-tai! time-in (make-time-unnormalized #f #f #f)
+                                          'time-utc->time-monotonic)))
+     (set-time-type! ntime time-monotonic)
+@@ -562,7 +568,8 @@
+ 
+ (define (time-utc->time-monotonic! time-in)
+   (if (not (eq? (time-type time-in) time-utc))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-utc->time-monotonic!
++                       'incompatible-time-types time-in))
+   (let ((ntime (priv:time-utc->time-tai! time-in time-in
+                                          'time-utc->time-monotonic!)))
+     (set-time-type! ntime time-monotonic)
+@@ -570,14 +577,16 @@
+ 
+ (define (time-tai->time-monotonic time-in)
+   (if (not (eq? (time-type time-in) time-tai))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-tai->time-monotonic
++                       'incompatible-time-types time-in))
+   (let ((ntime (copy-time time-in)))
+     (set-time-type! ntime time-monotonic)
+     ntime))
+ 
+ (define (time-tai->time-monotonic! time-in)
+   (if (not (eq? (time-type time-in) time-tai))
+-      (priv:time-error caller 'incompatible-time-types time-in))
++      (priv:time-error 'time-tai->time-monotonic!
++                       'incompatible-time-types time-in))
+   (set-time-type! time-in time-monotonic)
+   time-in)
+ 
+@@ -780,7 +789,7 @@
+ (define (priv:year-day day month year)
+   (let ((days-pr (assoc month priv:month-assoc)))
+     (if (not days-pr)
+-        (priv:error 'date-year-day 'invalid-month-specification month))
++        (priv:time-error 'date-year-day 'invalid-month-specification month))
+     (if (and (priv:leap-year? year) (> month 2))
+         (+ day (cdr days-pr) 1)
+         (+ day (cdr days-pr)))))
+@@ -1263,7 +1272,7 @@
+    ((#\8) 8)
+    ((#\9) 9)
+    (else (priv:time-error 'bad-date-template-string
+-                          (list "Non-integer character" ch i)))))
++                          (list "Non-integer character" ch)))))
+ 
+ ;; read an integer upto n characters long on port; upto -> #f is any length
+ (define (priv:integer-reader upto port)
+diff --git a/srfi/srfi-35.scm b/srfi/srfi-35.scm
+index 2035466..ee20a10 100644
+--- a/srfi/srfi-35.scm
++++ b/srfi/srfi-35.scm
+@@ -57,6 +57,19 @@
+                                    (number->string (object-address ct)
+                                                    16))))))
+ 
++(define (%make-condition-type layout id parent all-fields)
++  (let ((struct (make-struct %condition-type-vtable 0
++                             (make-struct-layout layout) ;; layout
++                             print-condition             ;; printer
++                             id parent all-fields)))
++
++    ;; Hack to associate STRUCT with a name, providing a better name for
++    ;; GOOPS classes as returned by `class-of' et al.
++    (set-struct-vtable-name! struct (cond ((symbol? id) id)
++                                          ((string? id) (string->symbol id))
++                                          (else         (string->symbol ""))))
++    struct))
++
+ (define (condition-type? obj)
+   "Return true if OBJ is a condition type."
+   (and (struct? obj)
+@@ -104,10 +117,8 @@ supertypes."
+                                               field-names parent-fields)))
+                (let* ((all-fields (append parent-fields field-names))
+                       (layout     (struct-layout-for-condition all-fields)))
+-                 (make-struct %condition-type-vtable 0
+-                              (make-struct-layout layout) ;; layout
+-                              print-condition             ;; printer
+-                              id parent all-fields))
++                 (%make-condition-type layout
++                                        id parent all-fields))
+                (error "invalid condition type field names"
+                       field-names)))
+          (error "parent is not a condition type" parent))
+@@ -126,13 +137,10 @@ supertypes."
+          (let* ((all-fields (append-map condition-type-all-fields
+                                         parents))
+                 (layout     (struct-layout-for-condition all-fields)))
+-           (make-struct %condition-type-vtable 0
+-                        (make-struct-layout layout) ;; layout
+-                        print-condition             ;; printer
+-                        id
+-                        parents                     ;; list of parents!
+-                        all-fields
+-                        all-fields)))))
++           (%make-condition-type layout
++                                 id
++                                 parents         ;; list of parents!
++                                 all-fields)))))
+ 
+ 
+ ;;;
+diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
+index e7cfd82..058ce93 100644
+--- a/test-suite/standalone/Makefile.am
++++ b/test-suite/standalone/Makefile.am
+@@ -28,7 +28,9 @@ check_SCRIPTS =
+ BUILT_SOURCES =
+ EXTRA_DIST =
+ 
+-TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
++TESTS_ENVIRONMENT =                                            \
++  builddir="$(builddir)"                                       \
++  "${top_builddir}/pre-inst-guile-env"
+ 
+ test_cflags =                                  \
+   -I$(top_srcdir)/test-suite/standalone                \
+diff --git a/test-suite/standalone/test-asmobs b/test-suite/standalone/test-asmobs
+index 2ea75d9..9689ab9 100755
+--- a/test-suite/standalone/test-asmobs
++++ b/test-suite/standalone/test-asmobs
+@@ -2,7 +2,8 @@
+ exec guile -q -s "$0" "$@"
+ !#
+ 
+-(load-extension "libtest-asmobs" "libtest_asmobs_init")
++(load-extension (string-append (getenv "builddir") "/libtest-asmobs")
++                "libtest_asmobs_init")
+ 
+ (define (test x v)
+   (if v
+diff --git a/test-suite/standalone/test-conversion.c b/test-suite/standalone/test-conversion.c
+index 41f99d3..caa835d 100644
+--- a/test-suite/standalone/test-conversion.c
++++ b/test-suite/standalone/test-conversion.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1999,2000,2001,2003,2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 1999,2000,2001,2003,2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -702,10 +702,8 @@ DEFSTST (scm_to_int16)
+ DEFUTST (scm_to_uint16)
+ DEFSTST (scm_to_int32)
+ DEFUTST (scm_to_uint32)
+-#ifdef SCM_HAVE_T_INT64
+ DEFSTST (scm_to_int64)
+ DEFUTST (scm_to_uint64)
+-#endif
+ 
+ #define TEST_8S(v,f,r,re,te) test_8s (v, tst_##f, #f, r, re, te)
+ #define TEST_8U(v,f,r,re,te) test_8u (v, tst_##f, #f, r, re, te)
+@@ -745,11 +743,9 @@ test_int_sizes ()
+   TEST_7S (scm_from_int32,  SCM_T_INT32_MAX+1LL, "-2147483648");
+   TEST_7U (scm_from_uint32, SCM_T_UINT32_MAX,     "4294967295");
+ 
+-#if SCM_HAVE_T_INT64
+   TEST_7S (scm_from_int64,  SCM_T_INT64_MIN,  "-9223372036854775808");
+   TEST_7S (scm_from_int64,  SCM_T_INT64_MAX,   "9223372036854775807");
+   TEST_7U (scm_from_uint64, SCM_T_UINT64_MAX, "18446744073709551615");
+-#endif
+ 
+   TEST_8S ("91",   scm_to_schar,   91, 0, 0);
+   TEST_8U ("91",   scm_to_uchar,   91, 0, 0);
+@@ -794,7 +790,6 @@ test_int_sizes ()
+   TEST_8U ("-1",          scm_to_uint32,                0, 1, 0);
+   TEST_8U ("#f",          scm_to_uint32,                0, 0, 1);
+ 
+-#if SCM_HAVE_T_INT64
+   TEST_8S ("-9223372036854775808", scm_to_int64,   SCM_T_INT64_MIN, 0, 0);
+   TEST_8S ("9223372036854775807",  scm_to_int64,   SCM_T_INT64_MAX, 0, 0);
+   TEST_8S ("9223372036854775808",  scm_to_int64,                 0, 1, 0);
+@@ -803,7 +798,6 @@ test_int_sizes ()
+   TEST_8U ("18446744073709551616", scm_to_uint64,                0, 1, 0);
+   TEST_8U ("-1",                   scm_to_uint64,                0, 1, 0);
+   TEST_8U ("#f",                   scm_to_uint64,                0, 0, 1);
+-#endif
+ 
+ }
+ 
+diff --git a/test-suite/tests/goops.test b/test-suite/tests/goops.test
+index fa53fd2..fb2535a 100644
+--- a/test-suite/tests/goops.test
++++ b/test-suite/tests/goops.test
+@@ -140,7 +140,12 @@
+     (eq? (class-of "foo") <string>))
+ 
+   (pass-if "port"
+-    (is-a? (%make-void-port "w") <port>)))
++    (is-a? (%make-void-port "w") <port>))
++
++  (pass-if "struct vtable"
++    ;; Previously, `class-of' would fail for nameless structs, i.e., structs
++    ;; for which `struct-vtable-name' is #f.
++    (is-a? (class-of (make-vtable-vtable "prprpr" 0)) <class>)))
+ 
+ 
+ (with-test-prefix "defining classes"
+diff --git a/test-suite/tests/socket.test b/test-suite/tests/socket.test
+index 4bfc415..e73f585 100644
+--- a/test-suite/tests/socket.test
++++ b/test-suite/tests/socket.test
+@@ -1,6 +1,6 @@
+ ;;;; socket.test --- test socket functions     -*- scheme -*-
+ ;;;;
+-;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ ;;;;
+ ;;;; This library is free software; you can redistribute it and/or
+ ;;;; modify it under the terms of the GNU Lesser General Public
+@@ -174,13 +174,28 @@
+ ;;; AF_UNIX sockets and `make-socket-address'
+ ;;;
+ 
++(define %tmpdir
++  ;; Honor `$TMPDIR', which tmpnam(3) doesn't do.
++  (or (getenv "TMPDIR") "/tmp"))
++
++(define %curdir
++  ;; Remember the current working directory.
++  (getcwd))
++
++;; Temporarily cd to %TMPDIR.  The goal is to work around path name
++;; limitations, which can lead to exceptions like:
++;;
++;;  (misc-error "scm_to_sockaddr"
++;;              "unix address path too long: ~A"
++;;              ("/tmp/nix-build-fb7bph4ifh0vr3ihigm702dzffdnapfj-guile-coverage-1.9.5.drv-0/guile-test-socket-1258553296-77619")
++;;              #f)
++(chdir %tmpdir)
++
+ (define (temp-file-path)
+-  ;; Return a temporary file path that honors `$TMPDIR', which `tmpnam'
+-  ;; doesn't do.
+-  (let ((dir (or (getenv "TMPDIR") "/tmp")))
+-    (string-append dir "/guile-test-socket-"
+-                   (number->string (current-time)) "-"
+-                   (number->string (random 100000)))))
++  ;; Return a temporary file name, assuming the current directory is %TMPDIR.
++  (string-append "guile-test-socket-"
++                 (number->string (current-time)) "-"
++                 (number->string (random 100000))))
+ 
+ 
+ (if (defined? 'AF_UNIX)
+@@ -320,3 +335,91 @@
+ 
+        #t)))
+ 
++
++(if (defined? 'AF_INET6)
++    (with-test-prefix "AF_INET6/SOCK_STREAM"
++
++      ;; testing `bind', `listen' and `connect' on stream-oriented sockets
++
++      (let ((server-socket (socket AF_INET6 SOCK_STREAM 0))
++           (server-bound? #f)
++           (server-listening? #f)
++           (server-pid #f)
++           (ipv6-addr 1)               ; ::1
++           (server-port 8889)
++           (client-port 9998))
++
++       (pass-if "bind"
++         (catch 'system-error
++           (lambda ()
++             (bind server-socket AF_INET6 ipv6-addr server-port)
++             (set! server-bound? #t)
++             #t)
++           (lambda args
++             (let ((errno (system-error-errno args)))
++               (cond ((= errno EADDRINUSE) (throw 'unresolved))
++                     (else (apply throw args)))))))
++
++       (pass-if "bind/sockaddr"
++         (let* ((sock (socket AF_INET6 SOCK_STREAM 0))
++                (sockaddr (make-socket-address AF_INET6 ipv6-addr client-port)))
++           (catch 'system-error
++             (lambda ()
++               (bind sock sockaddr)
++               #t)
++             (lambda args
++               (let ((errno (system-error-errno args)))
++                 (cond ((= errno EADDRINUSE) (throw 'unresolved))
++                       (else (apply throw args))))))))
++
++       (pass-if "listen"
++         (if (not server-bound?)
++             (throw 'unresolved)
++             (begin
++               (listen server-socket 123)
++               (set! server-listening? #t)
++               #t)))
++
++       (if server-listening?
++           (let ((pid (primitive-fork)))
++             ;; Spawn a server process.
++             (case pid
++               ((-1) (throw 'unresolved))
++               ((0)   ;; the kid:  serve two connections and exit
++                (let serve ((conn
++                             (false-if-exception (accept server-socket)))
++                            (count 1))
++                  (if (not conn)
++                      (exit 1)
++                      (if (> count 0)
++                          (serve (false-if-exception (accept server-socket))
++                                 (- count 1)))))
++                (exit 0))
++               (else  ;; the parent
++                (set! server-pid pid)
++                #t))))
++
++       (pass-if "connect"
++         (if (not server-pid)
++             (throw 'unresolved)
++             (let ((s (socket AF_INET6 SOCK_STREAM 0)))
++               (connect s AF_INET6 ipv6-addr server-port)
++               #t)))
++
++       (pass-if "connect/sockaddr"
++         (if (not server-pid)
++             (throw 'unresolved)
++             (let ((s (socket AF_INET6 SOCK_STREAM 0)))
++               (connect s (make-socket-address AF_INET6 ipv6-addr server-port))
++               #t)))
++
++       (pass-if "accept"
++         (if (not server-pid)
++             (throw 'unresolved)
++             (let ((status (cdr (waitpid server-pid))))
++               (eq? 0 (status:exit-val status)))))
++
++       #t)))
++
++;; Switch back to the previous directory.
++(false-if-exception (chdir %curdir))
diff --git a/meta-oe/recipes-support/guile/guile-native.inc b/meta-oe/recipes-support/guile/guile-native.inc
new file mode 100644
index 000000000..831e08813
--- /dev/null
+++ b/meta-oe/recipes-support/guile/guile-native.inc
@@ -0,0 +1,12 @@
+SECTION = "unknown"
+LICENSE = "GPL"
+DEPENDS = "gettext-native gmp-native"
+
+inherit autotools native
+
+S="${WORKDIR}/guile-${PV}"
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-Werror':'':g
+}
+
diff --git a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
new file mode 100644
index 000000000..aa4fbb039
--- /dev/null
+++ b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb
@@ -0,0 +1,8 @@
+require guile-native.inc
+SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
+           file://configure-fix.patch \
+           file://cpp-linemarkers.patch \
+          "
+
+SRC_URI[md5sum] = "991b5b3efcbbc3f7507d05bc42f80a5e"
+SRC_URI[sha256sum] = "bfee6339d91955a637e7f541d96f5b1d53271b42bb4a37b8867d186a6c66f0b3"
diff --git a/meta-oe/recipes-support/guile/guile.inc b/meta-oe/recipes-support/guile/guile.inc
new file mode 100644
index 000000000..f01596590
--- /dev/null
+++ b/meta-oe/recipes-support/guile/guile.inc
@@ -0,0 +1,46 @@
+DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \
+packaged as a library which can be incorporated into your programs."
+HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
+SECTION = "devel/scheme"
+DEPENDS = "guile-native gmp libtool"
+LICENSE = "GPL"
+PACKAGES =+ "${PN}-el"
+FILES_${PN}-el = "${datadir}/emacs"
+DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"
+
+inherit autotools
+
+acpaths = "-I ${S}/guile-config"
+
+EXTRA_OECONF = " \
+                --without-threads \
+                --without-included-ltdl \
+               "                
+
+do_compile() {
+        for i in $(find ${S} -name "Makefile") ; do
+                sed -i -e s:-Werror::g $i
+        done
+
+        (cd libguile; oe_runmake CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" guile_filter_doc_snarfage)
+        oe_runmake preinstguile="`which guile`"
+        
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+               -e s:-L/usr/lib::g \
+               -e s:-isystem/usr/include::g \
+               -e s:,/usr/lib:,\$\{libdir\}:g \
+                  guile-1.8.pc
+}
+
+SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"
+
+guile_cross_config() {
+        # Create guile-config returning target values instead of native values
+        install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
+        echo '#!'`which guile`$' \\\n-e main -s\n!#\n(define %guile-build-info '\'\( >guile-config.cross
+        sed -n $'s:-isystem[^ ]* ::;s:-Wl,-rpath-link,[^ ]* ::;s:^[ \t]*{[ \t]*":  (:;s:",[ \t]*": . ":;s:" *}, *\\\\:"):;/^  (/p' <libguile/libpath.h >>guile-config.cross
+        echo '))' >>guile-config.cross
+        cat guile-config/guile-config >>guile-config.cross
+        install guile-config.cross ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/guile-config
+}
diff --git a/meta-oe/recipes-support/guile/guile_1.8.7.bb b/meta-oe/recipes-support/guile/guile_1.8.7.bb
new file mode 100644
index 000000000..8b3a80d91
--- /dev/null
+++ b/meta-oe/recipes-support/guile/guile_1.8.7.bb
@@ -0,0 +1,12 @@
+require guile.inc
+
+PR = "r1"
+
+SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
+           file://configure-fix.patch \
+           file://18.diff \
+          "
+
+
+SRC_URI[md5sum] = "991b5b3efcbbc3f7507d05bc42f80a5e"
+SRC_URI[sha256sum] = "bfee6339d91955a637e7f541d96f5b1d53271b42bb4a37b8867d186a6c66f0b3"
diff --git a/recipes-support/htop/htop/remove-proc-test.patch b/meta-oe/recipes-support/htop/htop/remove-proc-test.patch
index 3185fdd1f..3185fdd1f 100644
--- a/recipes-support/htop/htop/remove-proc-test.patch
+++ b/meta-oe/recipes-support/htop/htop/remove-proc-test.patch
diff --git a/recipes-support/htop/htop_0.9.bb b/meta-oe/recipes-support/htop/htop_0.9.bb
index eb207aabe..eb207aabe 100644
--- a/recipes-support/htop/htop_0.9.bb
+++ b/meta-oe/recipes-support/htop/htop_0.9.bb
diff --git a/recipes-support/libgcrypt/libgcrypt.inc b/meta-oe/recipes-support/libgcrypt/libgcrypt.inc
index da882dcc7..da882dcc7 100644
--- a/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta-oe/recipes-support/libgcrypt/libgcrypt.inc
diff --git a/recipes-support/libgcrypt/libgcrypt/add-pkgconfig-support.patch b/meta-oe/recipes-support/libgcrypt/libgcrypt/add-pkgconfig-support.patch
index 24a59787a..24a59787a 100644
--- a/recipes-support/libgcrypt/libgcrypt/add-pkgconfig-support.patch
+++ b/meta-oe/recipes-support/libgcrypt/libgcrypt/add-pkgconfig-support.patch
diff --git a/recipes-support/libgcrypt/libgcrypt_1.4.6.bb b/meta-oe/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
index a59243791..a59243791 100644
--- a/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
+++ b/meta-oe/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
diff --git a/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch b/meta-oe/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
index 49e47d874..49e47d874 100644
--- a/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
+++ b/meta-oe/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
diff --git a/recipes-support/libgpg-error/libgpg-error_1.8.bb b/meta-oe/recipes-support/libgpg-error/libgpg-error_1.8.bb
index 5f6b72cd5..5f6b72cd5 100644
--- a/recipes-support/libgpg-error/libgpg-error_1.8.bb
+++ b/meta-oe/recipes-support/libgpg-error/libgpg-error_1.8.bb
diff --git a/recipes-support/libusb/libusb-compat_0.1.3.bbappend b/meta-oe/recipes-support/libusb/libusb-compat_0.1.3.bbappend
index 7de23617d..7de23617d 100644
--- a/recipes-support/libusb/libusb-compat_0.1.3.bbappend
+++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.3.bbappend
diff --git a/recipes-support/mysql/files/autofoo.patch b/meta-oe/recipes-support/mysql/files/autofoo.patch
index 669393a23..669393a23 100644
--- a/recipes-support/mysql/files/autofoo.patch
+++ b/meta-oe/recipes-support/mysql/files/autofoo.patch
diff --git a/recipes-support/mysql/files/configure-ps-cache-check.patch b/meta-oe/recipes-support/mysql/files/configure-ps-cache-check.patch
index 3b5b3fd06..3b5b3fd06 100644
--- a/recipes-support/mysql/files/configure-ps-cache-check.patch
+++ b/meta-oe/recipes-support/mysql/files/configure-ps-cache-check.patch
diff --git a/recipes-support/mysql/files/fix_host_path.patch b/meta-oe/recipes-support/mysql/files/fix_host_path.patch
index 4f69cd519..4f69cd519 100644
--- a/recipes-support/mysql/files/fix_host_path.patch
+++ b/meta-oe/recipes-support/mysql/files/fix_host_path.patch
diff --git a/recipes-support/mysql/files/my.cnf b/meta-oe/recipes-support/mysql/files/my.cnf
index 85560ebf5..85560ebf5 100644
--- a/recipes-support/mysql/files/my.cnf
+++ b/meta-oe/recipes-support/mysql/files/my.cnf
diff --git a/recipes-support/mysql/files/mysqld.sh b/meta-oe/recipes-support/mysql/files/mysqld.sh
index 479ebdb25..479ebdb25 100644
--- a/recipes-support/mysql/files/mysqld.sh
+++ b/meta-oe/recipes-support/mysql/files/mysqld.sh
diff --git a/recipes-support/mysql/mysql5-native_5.1.40.bb b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb
index 800178330..800178330 100644
--- a/recipes-support/mysql/mysql5-native_5.1.40.bb
+++ b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb
diff --git a/recipes-support/mysql/mysql5/Makefile.am.patch b/meta-oe/recipes-support/mysql/mysql5/Makefile.am.patch
index 33fd17acd..33fd17acd 100644
--- a/recipes-support/mysql/mysql5/Makefile.am.patch
+++ b/meta-oe/recipes-support/mysql/mysql5/Makefile.am.patch
diff --git a/recipes-support/mysql/mysql5/configure-ps-cache-check.patch b/meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch
index 3b5b3fd06..3b5b3fd06 100644
--- a/recipes-support/mysql/mysql5/configure-ps-cache-check.patch
+++ b/meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch
diff --git a/recipes-support/mysql/mysql5/configure.in.patch b/meta-oe/recipes-support/mysql/mysql5/configure.in.patch
index 3edc5f3c2..3edc5f3c2 100644
--- a/recipes-support/mysql/mysql5/configure.in.patch
+++ b/meta-oe/recipes-support/mysql/mysql5/configure.in.patch
diff --git a/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch b/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
index 58812c1f1..58812c1f1 100644
--- a/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
+++ b/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
diff --git a/recipes-support/mysql/mysql5/fix_host_path.patch b/meta-oe/recipes-support/mysql/mysql5/fix_host_path.patch
index 4f69cd519..4f69cd519 100644
--- a/recipes-support/mysql/mysql5/fix_host_path.patch
+++ b/meta-oe/recipes-support/mysql/mysql5/fix_host_path.patch
diff --git a/recipes-support/mysql/mysql5/misc.m4.patch b/meta-oe/recipes-support/mysql/mysql5/misc.m4.patch
index 7b0acff21..7b0acff21 100644
--- a/recipes-support/mysql/mysql5/misc.m4.patch
+++ b/meta-oe/recipes-support/mysql/mysql5/misc.m4.patch
diff --git a/recipes-support/mysql/mysql5/my.cnf b/meta-oe/recipes-support/mysql/mysql5/my.cnf
index 7f557e425..7f557e425 100644
--- a/recipes-support/mysql/mysql5/my.cnf
+++ b/meta-oe/recipes-support/mysql/mysql5/my.cnf
diff --git a/recipes-support/mysql/mysql5/mysqld.sh b/meta-oe/recipes-support/mysql/mysql5/mysqld.sh
index 479ebdb25..479ebdb25 100644
--- a/recipes-support/mysql/mysql5/mysqld.sh
+++ b/meta-oe/recipes-support/mysql/mysql5/mysqld.sh
diff --git a/recipes-support/mysql/mysql5/plug.in.patch b/meta-oe/recipes-support/mysql/mysql5/plug.in.patch
index 70c39fa7a..70c39fa7a 100644
--- a/recipes-support/mysql/mysql5/plug.in.patch
+++ b/meta-oe/recipes-support/mysql/mysql5/plug.in.patch
diff --git a/recipes-support/mysql/mysql5_5.1.40.bb b/meta-oe/recipes-support/mysql/mysql5_5.1.40.bb
index 5229312dc..5229312dc 100644
--- a/recipes-support/mysql/mysql5_5.1.40.bb
+++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.bb
diff --git a/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
index 348f4e38d..348f4e38d 100644
--- a/recipes-support/mysql/mysql5_5.1.40.inc
+++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
diff --git a/recipes-support/ntp/files/hipox/ntp.conf b/meta-oe/recipes-support/ntp/files/hipox/ntp.conf
index 57e585c17..57e585c17 100644
--- a/recipes-support/ntp/files/hipox/ntp.conf
+++ b/meta-oe/recipes-support/ntp/files/hipox/ntp.conf
diff --git a/recipes-support/ntp/files/hipox/ntpd b/meta-oe/recipes-support/ntp/files/hipox/ntpd
index 7d2cd34cd..7d2cd34cd 100755
--- a/recipes-support/ntp/files/hipox/ntpd
+++ b/meta-oe/recipes-support/ntp/files/hipox/ntpd
diff --git a/recipes-support/ntp/files/ntp b/meta-oe/recipes-support/ntp/files/ntp
index e91a52869..e91a52869 100755
--- a/recipes-support/ntp/files/ntp
+++ b/meta-oe/recipes-support/ntp/files/ntp
diff --git a/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch b/meta-oe/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
index cb1e2f734..cb1e2f734 100644
--- a/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
+++ b/meta-oe/recipes-support/ntp/files/ntp-4.2.4_p6-nano.patch
diff --git a/recipes-support/ntp/files/ntp.conf b/meta-oe/recipes-support/ntp/files/ntp.conf
index 02a44b0d0..02a44b0d0 100644
--- a/recipes-support/ntp/files/ntp.conf
+++ b/meta-oe/recipes-support/ntp/files/ntp.conf
diff --git a/recipes-support/ntp/files/ntpd b/meta-oe/recipes-support/ntp/files/ntpd
index ae50f135d..ae50f135d 100755
--- a/recipes-support/ntp/files/ntpd
+++ b/meta-oe/recipes-support/ntp/files/ntpd
diff --git a/recipes-support/ntp/files/ntpdate b/meta-oe/recipes-support/ntp/files/ntpdate
index 784b029ad..784b029ad 100755
--- a/recipes-support/ntp/files/ntpdate
+++ b/meta-oe/recipes-support/ntp/files/ntpdate
diff --git a/recipes-support/ntp/files/tickadj.c.patch b/meta-oe/recipes-support/ntp/files/tickadj.c.patch
index 9ef9de9e1..9ef9de9e1 100644
--- a/recipes-support/ntp/files/tickadj.c.patch
+++ b/meta-oe/recipes-support/ntp/files/tickadj.c.patch
diff --git a/recipes-support/ntp/ntp-ssl_4.2.6p3.bb b/meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
index a15899079..a15899079 100644
--- a/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
+++ b/meta-oe/recipes-support/ntp/ntp-ssl_4.2.6p3.bb
diff --git a/recipes-support/ntp/ntp.inc b/meta-oe/recipes-support/ntp/ntp.inc
index c72e40e79..c72e40e79 100644
--- a/recipes-support/ntp/ntp.inc
+++ b/meta-oe/recipes-support/ntp/ntp.inc
diff --git a/recipes-support/ntp/ntp_4.2.6p3.bb b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
index f64f6f6d9..f64f6f6d9 100644
--- a/recipes-support/ntp/ntp_4.2.6p3.bb
+++ b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
diff --git a/recipes-support/postgresql/files/no-ecpg-test.patch b/meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch
index c0f28f425..c0f28f425 100644
--- a/recipes-support/postgresql/files/no-ecpg-test.patch
+++ b/meta-oe/recipes-support/postgresql/files/no-ecpg-test.patch
diff --git a/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch
index d027061d8..d027061d8 100644
--- a/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch
+++ b/meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch
diff --git a/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index edad3bcc5..edad3bcc5 100644
--- a/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
diff --git a/recipes-support/postgresql/postgresql_8.4.4.bb b/meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb
index d0f507849..d0f507849 100644
--- a/recipes-support/postgresql/postgresql_8.4.4.bb
+++ b/meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb
diff --git a/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
index 914422f1d..914422f1d 100644
--- a/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
+++ b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
diff --git a/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch
index b84b6486e..b84b6486e 100644
--- a/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch
+++ b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch
diff --git a/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc
index 6bc742eec..6bc742eec 100644
--- a/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc
+++ b/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc
diff --git a/recipes-support/sqlite/sqlite_2.8.17.bb b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb
index 75678f629..75678f629 100644
--- a/recipes-support/sqlite/sqlite_2.8.17.bb
+++ b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb